Jakub Kicinski 7df621a3ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... include/net/sock.h 7b50ecfcc6 ("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.c 0daa55d033 ("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>		2021-10-28 10:43:58 -07:00
..
Kconfig	ethernet: select CONFIG_CRC32 as needed	2020-12-04 14:42:21 -08:00
lpc_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-10-28 10:43:58 -07:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00