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

Pull io_uring updates from Jens Axboe:
 "This is the first of the io_uring pull requests for the 6.15 merge
  window, there will be others once the net tree has gone in. This
  contains:

   - Cleanup and unification of cancelation handling across various
     request types.

   - Improvement for bundles, supporting them both for incrementally
     consumed buffers, and for non-multishot requests.

   - Enable toggling of using iowait while waiting on io_uring events or
     not. Unfortunately this is still tied with CPU frequency boosting
     on short waits, as the scheduler side has not been very receptive
     to splitting the (useless) iowait stat from the cpufreq implied
     boost.

   - Add support for kbuf nodes, enabling zero-copy support for the ublk
     block driver.

   - Various cleanups for resource node handling.

   - Series greatly cleaning up the legacy provided (non-ring based)
     buffers. For years, we've been pushing the ring provided buffers as
     the way to go, and that is what people have been using. Reduce the
     complexity and code associated with legacy provided buffers.

   - Series cleaning up the compat handling.

   - Series improving and cleaning up the recvmsg/sendmsg iovec and msg
     handling.

   - Series of cleanups for io-wq.

   - Start adding a bunch of selftests. The liburing repository
     generally carries feature and regression tests for everything, but
     at least for ublk initially, we'll try and go the route of having
     it in selftests as well. We'll see how this goes, might decide to
     migrate more tests this way in the future.

   - Various little cleanups and fixes"

* tag 'for-6.15/io_uring-20250322' of git://git.kernel.dk/linux: (108 commits)
  selftests: ublk: add stripe target
  selftests: ublk: simplify loop io completion
  selftests: ublk: enable zero copy for null target
  selftests: ublk: prepare for supporting stripe target
  selftests: ublk: move common code into common.c
  selftests: ublk: increase max buffer size to 1MB
  selftests: ublk: add single sqe allocator helper
  selftests: ublk: add generic_01 for verifying sequential IO order
  selftests: ublk: fix starting ublk device
  io_uring: enable toggle of iowait usage when waiting on CQEs
  selftests: ublk: fix write cache implementation
  selftests: ublk: add variable for user to not show test result
  selftests: ublk: don't show `modprobe` failure
  selftests: ublk: add one dependency header
  io_uring/kbuf: enable bundles for incrementally consumed buffers
  Revert "io_uring/rsrc: simplify the bvec iter count calculation"
  selftests: ublk: improve test usability
  selftests: ublk: add stress test for covering IO vs. killing ublk server
  selftests: ublk: add one stress test for covering IO vs. removing device
  selftests: ublk: load/unload ublk_drv when preparing & cleaning up tests
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/ublk_drv.c
Simple merge

diff --cc drivers/nvme/host/ioctl.c
index 24e2c702da7a2e25c74e45c0d52dcc1ff88f7748,fe9fb80c6a144f98a369d2eda73d1035fb10905a..ecf136489044ff3ac851a0f0bd26e8c4aa4b9ad2
--- 1/drivers/nvme/host/ioctl.c
--- 2/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@@ -141,12 -140,11 +142,13 @@@ static int nvme_map_user_request(struc
                struct iov_iter iter;
  
                /* fixedbufs is only for non-vectored io */
 -              if (WARN_ON_ONCE(flags & NVME_IOCTL_VEC))
 -                      return -EINVAL;
 +              if (WARN_ON_ONCE(flags & NVME_IOCTL_VEC)) {
 +                      ret = -EINVAL;
 +                      goto out;
 +              }
                ret = io_uring_cmd_import_fixed(ubuffer, bufflen,
-                               rq_data_dir(req), &iter, ioucmd);
+                               rq_data_dir(req), &iter, ioucmd,
+                               iou_issue_flags);
                if (ret < 0)
                        goto out;
                ret = blk_rq_map_user_iov(q, req, NULL, &iter, GFP_KERNEL);

diff --cc io_uring/io_uring.c
Simple merge

diff --cc io_uring/net.c
Simple merge

diff --cc io_uring/rw.c
Simple merge

diff --cc io_uring/timeout.c
Simple merge

diff --cc tools/testing/selftests/Makefile
Simple merge