From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jun 2026 15:09:57 +0000 (-0700)
Subject: Merge tag 'for-7.2/io_uring-epoll-20260616' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f9f5887b42711595e768b9dc0582dccfdf60c3b;p=thirdparty%2Flinux.git

Merge tag 'for-7.2/io_uring-epoll-20260616' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux

Pull io_uring epoll update from Jens Axboe:
 "As discussed a few months ago, this pull request gets rid of allowing
  nested epoll notification contexts via io_uring.

  Nested contexts have been a source of issues on the epoll side, and
  there should not be a need to support them from io_uring. The epoll
  io_uring side exists mainly to facilitate a gradual migration from a
  notification based epoll setup to an io_uring ditto"

* tag 'for-7.2/io_uring-epoll-20260616' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  io_uring/epoll: disallow adding an epoll file to an epoll context
  io_uring/epoll: switch to using do_epoll_ctl_file() interface
---

2f9f5887b42711595e768b9dc0582dccfdf60c3b