WSL2-Linux-Kernel/drivers/vdpa
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
..
ifcvf vdpa: Support transferring virtual addressing during DMA mapping 2021-09-06 07:20:57 -04:00
mlx5 RDMA/mlx5: Replace struct mlx5_core_mkey by u32 key 2021-10-19 14:34:12 +03:00
vdpa_sim vdpa: Support transferring virtual addressing during DMA mapping 2021-09-06 07:20:57 -04:00
vdpa_user vduse: Fix race condition between resetting and irq injecting 2021-10-22 06:49:14 -04:00
virtio_pci vdpa: Support transferring virtual addressing during DMA mapping 2021-09-06 07:20:57 -04:00
Kconfig vduse: Introduce VDUSE - vDPA Device in Userspace 2021-09-06 07:20:58 -04:00
Makefile vduse: Introduce VDUSE - vDPA Device in Userspace 2021-09-06 07:20:58 -04:00
vdpa.c virtio,vdpa,vhost: features, fixes 2021-09-11 14:48:42 -07:00