From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 May 2025 16:59:24 +0000 (-0700)
Subject: Merge tag 'io_uring-6.15-20250515' of git://git.kernel.dk/linux
X-Git-Tag: v6.15-rc7~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2661da1b302c7c80ad2306bde4d324956cff26c;p=thirdparty%2Flinux.git

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

Pull io_uring fixes from Jens Axboe:

 - Fix a regression with highmem and mapping of regions, where
   the coalescing code assumes any page is directly mapped

 - Fix an issue with HYBRID_IOPOLL and passthrough commands,
   where the timer wasn't always setup correctly

 - Fix an issue with fdinfo not correctly locking around reading
   the rings, which can be an issue if the ring is being resized
   at the same time

* tag 'io_uring-6.15-20250515' of git://git.kernel.dk/linux:
  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
---

e2661da1b302c7c80ad2306bde4d324956cff26c