include/net/sock.h7b50ecfcc6
("net: Rename ->stream_memory_read to ->sock_is_readable")4c1e34c0db
("vsock: Enable y2038 safe timeval for timeout") drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c0daa55d033
("octeontx2-af: cn10k: debugfs for dumping LMTST map table")e77bcdd1f6
("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.") Adjacent code addition in both cases, keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org>