From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Mar 2025 21:55:32 +0000 (-0700)
Subject: Merge tag 'for-6.15/io_uring-epoll-wait-20250325' of git://git.kernel.dk/linux
X-Git-Tag: nvme-6.15-2025-04-02~49
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6df9d086ffcb6b0521872fef5f9f4dd1907abb9a;p=nvme.git

Merge tag 'for-6.15/io_uring-epoll-wait-20250325' of git://git.kernel.dk/linux

Pull io_uring epoll support from Jens Axboe:
 "This adds support for reading epoll events via io_uring.

  While this may seem counter-intuitive (and/or productive), the
  reasoning here is that quite a few existing epoll event loops can
  easily do a partial conversion to a completion based model, but are
  still stuck with one (or few) event types that remain readiness based.

  For that case, they then need to add the io_uring fd to the epoll
  context, and continue to rely on epoll_wait(2) for waiting on events.
  This misses out on the finer grained waiting that io_uring can do, to
  reduce context switches and wait for multiple events in one batch
  reliably.

  With adding support for reaping epoll events via io_uring, the whole
  legacy readiness based event types can still be reaped via epoll, with
  the overall waiting in the loop be driven by io_uring"

* tag 'for-6.15/io_uring-epoll-wait-20250325' of git://git.kernel.dk/linux:
  io_uring/epoll: add support for IORING_OP_EPOLL_WAIT
  io_uring/epoll: remove CONFIG_EPOLL guards
---

6df9d086ffcb6b0521872fef5f9f4dd1907abb9a