]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Revert "Merge branch 'netkit-support-for-io_uring-zero-copy-and-af_xdp'"
authorJakub Kicinski <kuba@kernel.org>
Wed, 21 Jan 2026 02:04:55 +0000 (18:04 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 21 Jan 2026 02:06:01 +0000 (18:06 -0800)
commit8766d61a1d33cb5f15bfdd6ce9832bbe1fc649c2
tree3b48f0bfd96379e5b19d9b78017512016f7cda91
parent77b9c4a438fc66e2ab004c411056b3fb71a54f2c
Revert "Merge branch 'netkit-support-for-io_uring-zero-copy-and-af_xdp'"

This reverts commit 77b9c4a438fc66e2ab004c411056b3fb71a54f2c, reversing
changes made to 4515ec4ad58a37e70a9e1256c0b993958c9b7497:

 931420a2fc36 ("selftests/net: Add netkit container tests")
 ab771c938d9a ("selftests/net: Make NetDrvContEnv support queue leasing")
 6be87fbb2776 ("selftests/net: Add env for container based tests")
 61d99ce3dfc2 ("selftests/net: Add bpf skb forwarding program")
 920da3634194 ("netkit: Add xsk support for af_xdp applications")
 eef51113f8af ("netkit: Add netkit notifier to check for unregistering devices")
 b5ef109d22d4 ("netkit: Implement rtnl_link_ops->alloc and ndo_queue_create")
 b5c3fa4a0b16 ("netkit: Add single device mode for netkit")
 0073d2fd679d ("xsk: Proxy pool management for leased queues")
 1ecea95dd3b5 ("xsk: Extend xsk_rcv_check validation")
 804bf334d08a ("net: Proxy netdev_queue_get_dma_dev for leased queues")
 0caa9a8ddec3 ("net: Proxy net_mp_{open,close}_rxq for leased queues")
 ff8889ff9107 ("net, ethtool: Disallow leased real rxqs to be resized")
 9e2103f36110 ("net: Add lease info to queue-get response")
 31127deddef4 ("net: Implement netdev_nl_queue_create_doit")
 a5546e18f77c ("net: Add queue-create operation")

The series will conflict with io_uring work, and the code needs more
polish.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
28 files changed:
Documentation/netlink/specs/netdev.yaml
drivers/net/netkit.c
include/linux/netdevice.h
include/net/netdev_queues.h
include/net/netdev_rx_queue.h
include/net/page_pool/memory_provider.h
include/net/xdp_sock_drv.h
include/uapi/linux/if_link.h
include/uapi/linux/netdev.h
net/core/dev.c
net/core/dev.h
net/core/netdev-genl-gen.c
net/core/netdev-genl-gen.h
net/core/netdev-genl.c
net/core/netdev_queues.c
net/core/netdev_rx_queue.c
net/ethtool/channels.c
net/ethtool/ioctl.c
net/xdp/xsk.c
tools/include/uapi/linux/netdev.h
tools/testing/selftests/drivers/net/README.rst
tools/testing/selftests/drivers/net/hw/Makefile
tools/testing/selftests/drivers/net/hw/lib/py/__init__.py
tools/testing/selftests/drivers/net/hw/nk_forward.bpf.c [deleted file]
tools/testing/selftests/drivers/net/hw/nk_netns.py [deleted file]
tools/testing/selftests/drivers/net/hw/nk_qlease.py [deleted file]
tools/testing/selftests/drivers/net/lib/py/__init__.py
tools/testing/selftests/drivers/net/lib/py/env.py