From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 13 Nov 2025 18:20:19 +0000 (-0700)
Subject: Merge branch 'zcrx-updates-6.19' into for-6.19/io_uring
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=f8f115baae2d83e7b5931114d294d8b7fc8f9642;p=linux%2F.git

Merge branch 'zcrx-updates-6.19' into for-6.19/io_uring

Merge zcrx updates from Pavel:

"Zcrx updates for 6.19. It includes a bunch of small patches,
 IORING_REGISTER_ZCRX_CTRL and RQ flushing (Patches 4-5) and David's
 work on sharing zcrx b/w multiple io_uring instances."

Link: https://lore.kernel.org/io-uring/cover.1763029704.git.asml.silence@gmail.com/
Signed-off-by: Jens Axboe <axboe@kernel.dk>

* zcrx-updates-6.19:
  io_uring/zcrx: share an ifq between rings
  io_uring/zcrx: add io_fill_zcrx_offsets()
  io_uring/zcrx: export zcrx via a file
  io_uring/zcrx: move io_zcrx_scrub() and dependencies up
  io_uring/zcrx: count zcrx users
  io_uring/zcrx: add sync refill queue flushing
  io_uring/zcrx: introduce IORING_REGISTER_ZCRX_CTRL
  io_uring/zcrx: elide passing msg flags
  io_uring/zcrx: use folio_nr_pages() instead of shift operation
  io_uring/zcrx: convert to use netmem_desc
---

f8f115baae2d83e7b5931114d294d8b7fc8f9642