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
..
Makefile	vmxnet3: prepare for version 6 changes	2021-07-16 17:32:14 -07:00
upt1_defs.h	vmxnet3: prepare for version 6 changes	2021-07-16 17:32:14 -07:00
vmxnet3_defs.h	vmxnet3: increase maximum configurable mtu to 9190	2021-07-16 17:32:14 -07:00
vmxnet3_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-10-28 10:43:58 -07:00
vmxnet3_ethtool.c	ethtool: extend coalesce setting uAPI with CQE mode	2021-08-24 07:38:29 -07:00
vmxnet3_int.h	vmxnet3: update to version 6	2021-07-16 17:32:14 -07:00