From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 16 May 2025 18:31:19 +0000 (-0600)
Subject: Merge branch 'io_uring-6.15' into for-6.16/io_uring
X-Git-Tag: v6.16-rc1~215^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3de7361f7cd9c7b79acba5a3c72588ee1d83f031;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'io_uring-6.15' into for-6.16/io_uring

Merge in 6.15 io_uring fixes, mostly so that the fdinfo changes can
get easily extended without causing merge conflicts.

* io_uring-6.15:
  io_uring/fdinfo: grab ctx->uring_lock around io_uring_show_fdinfo()
  io_uring/memmap: don't use page_address() on a highmem page
  io_uring/uring_cmd: fix hybrid polling initialization issue
  io_uring/sqpoll: Increase task_work submission batch size
  io_uring: ensure deferred completions are flushed for multishot
  io_uring: always arm linked timeouts prior to issue
  io_uring/fdinfo: annotate racy sq/cq head/tail reads
  io_uring: fix 'sync' handling of io_fallback_tw()
  io_uring: don't duplicate flushing in io_req_post_cqe
---

3de7361f7cd9c7b79acba5a3c72588ee1d83f031