From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jun 2023 17:08:27 +0000 (-0400)
Subject: Merge tag 'io_uring-6.4-2023-06-02' of git://git.kernel.dk/linux
X-Git-Tag: v6.6.17~4757
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26d147799001edfe479c0b015ba1cb038def5ae7;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'io_uring-6.4-2023-06-02' of git://git.kernel.dk/linux

Pull io_uring fix from Jens Axboe:
 "Just a single revert in here, removing the warning on the epoll ctl
  opcode.

  We originally deprecated this a few releases ago, but I've since had
  two people report that it's being used. Which isn't the biggest deal,
  obviously this is why we out in the deprecation notice in the first
  place, but it also means that we should just kill this warning again
  and abandon the deprecation plans.

  Since it's only a few handfuls of code to support epoll ctl, not worth
  going any further with this imho"

* tag 'io_uring-6.4-2023-06-02' of git://git.kernel.dk/linux:
  io_uring: undeprecate epoll_ctl support
---

26d147799001edfe479c0b015ba1cb038def5ae7