From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 20 Feb 2025 14:59:30 +0000 (-0700)
Subject: Merge branch 'for-6.15/io_uring-rx-zc' into for-6.15/io_uring-epoll-wait
X-Git-Tag: v6.15-rc1~123^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9269919478c284d478da27dd0afa0e6126272cd9;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'for-6.15/io_uring-rx-zc' into for-6.15/io_uring-epoll-wait

* for-6.15/io_uring-rx-zc: (77 commits)
  io_uring: Rename KConfig to Kconfig
  io_uring/zcrx: fix leaks on failed registration
  io_uring/zcrx: recheck ifq on shutdown
  io_uring/zcrx: add selftest
  net: add documentation for io_uring zcrx
  io_uring/zcrx: add copy fallback
  io_uring/zcrx: throttle receive requests
  io_uring/zcrx: set pp memory provider for an rx queue
  io_uring/zcrx: add io_recvzc request
  io_uring/zcrx: dma-map area for the device
  io_uring/zcrx: implement zerocopy receive pp memory provider
  io_uring/zcrx: grab a net device
  io_uring/zcrx: add io_zcrx_area
  io_uring/zcrx: add interface queue and refill queue
  net: add helpers for setting a memory provider on an rx queue
  net: page_pool: add memory provider helpers
  net: prepare for non devmem TCP memory providers
  net: page_pool: add a mp hook to unregister_netdevice*
  net: page_pool: add callback for mp info printing
  netdev: add io_uring memory provider info
  ...
---

9269919478c284d478da27dd0afa0e6126272cd9