From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2025 16:13:52 +0000 (-0700)
Subject: Merge tag 'io_uring-6.15-20250418' of git://git.kernel.dk/linux
X-Git-Tag: v6.15-rc3~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1011b2b451c8b6d16be6b07f44f22a0a0dd7158;p=thirdparty%2Flinux.git

Merge tag 'io_uring-6.15-20250418' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:

 - Correctly cap iov_iter->nr_segs for imports of registered buffers,
   both kbuf and normal ones.

   Three cleanups to make it saner first, then two fixes for each of the
   buffer types.

   This fixes a performance regression where partial buffer usage
   doesn't trim the tail number of segments, leading the block layer to
   iterate the IOs to check if it needs splitting.

 - Two patches tweaking the newly introduced zero-copy rx API, mostly to
   keep the API consistent once we add multiple interface queues per
   ring support in the 6.16 release.

 - zc rx unmapping fix for a dead device

* tag 'io_uring-6.15-20250418' of git://git.kernel.dk/linux:
  io_uring/zcrx: fix late dma unmap for a dead dev
  io_uring/rsrc: ensure segments counts are correct on kbuf buffers
  io_uring/rsrc: send exact nr_segs for fixed buffer
  io_uring/rsrc: refactor io_import_fixed
  io_uring/rsrc: separate kbuf offset adjustments
  io_uring/rsrc: don't skip offset calculation
  io_uring/zcrx: add pp to ifq conversion helper
  io_uring/zcrx: return ifq id to the user
---

b1011b2b451c8b6d16be6b07f44f22a0a0dd7158