Jakub Kicinski ec4c20ca09 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

net/mac80211/rx.c
  91535613b6 ("wifi: mac80211: don't drop all unprotected public action frames")
  6c02fab724 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value")

Adjacent changes:

drivers/net/ethernet/apm/xgene/xgene_enet_main.c
  61471264c0 ("net: ethernet: apm: Convert to platform remove callback returning void")
  d2ca43f306 ("net: xgene: Fix unused xgene_enet_of_match warning for !CONFIG_OF")

net/vmw_vsock/virtio_transport.c
  64c99d2d6a ("vsock/virtio: support to send non-linear skb")
  53b08c4985 ("vsock/virtio: initialize the_virtio_vsock before using VQs")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2023-10-26 13:46:28 -07:00

..

iotlb.c

vhost_iotlb: split out IOTLB initialization

2022-05-31 12:44:28 -04:00

Kconfig

vhost_task: Allow vhost layer to use copy_process

2023-03-23 12:45:36 +01:00

Makefile

vhost: introduce vDPA-based backend

2020-04-02 10:41:40 -04:00

net.c

vhost: convert poll work to be vq based

2023-07-03 12:15:13 -04:00

scsi.c

vhost-scsi: Rename vhost_scsi_iov_to_sgl

2023-08-10 15:24:28 -04:00

test.c

vhost-test: remove meaningless debug info

2023-02-20 19:26:58 -05:00

test.h

tools/virtio: Add --reset

2020-06-22 12:34:21 -04:00

vdpa.c

vdpa: add get_backend_features vdpa operation

2023-09-03 18:10:22 -04:00

vhost.c

vhost: Allow null msg.size on VHOST_IOTLB_INVALIDATE

2023-10-18 11:29:56 -04:00

vhost.h

vhost: Make parameter name match of vhost_get_vq_desc()

2023-07-03 12:15:15 -04:00

vringh.c

vringh: don't use vringh_kiov_advance() in vringh_iov_xfer()

2023-10-04 08:26:48 +01:00

vsock.c

vhost/vsock: support MSG_ZEROCOPY for transport

2023-10-15 13:19:42 +01:00