Merge remote-tracking branch 'block/for-next'

diff --cc drivers/nvme/host/core.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge

diff --cc fs/io_uring.c
index 903458afd56c17de177e29e58974aac45b7dbcba,a1ca6badff36dc9f57f0ab56b76b3a9b26c2b503..273b2dd7890ac88498d86c712fb43c3f0a13e5a7
--- 1/fs/io_uring.c
--- 2/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -9119,10 -9111,8 +9119,11 @@@ void __io_uring_cancel(struct files_str
        struct io_uring_task *tctx = current->io_uring;
        DEFINE_WAIT(wait);
        s64 inflight;
+       bool cancel_all = !files;
  
 +      if (tctx->io_wq)
 +              io_wq_exit_start(tctx->io_wq);
 +
        /* make sure overflow events are dropped */
        atomic_inc(&tctx->in_idle);
        do {

diff --cc kernel/sysctl.c
Simple merge