This is a note to let you know that I've just added the patch titled
io_uring: undeprecate epoll_ctl support
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
io_uring-undeprecate-epoll_ctl-support.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4ea0bf4b98d66a7a790abb285539f395596bae92 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@xxxxxxxxxxxxx>
Date: Sat, 6 May 2023 11:55:02 +0200
Subject: io_uring: undeprecate epoll_ctl support
From: Ben Noordhuis <info@xxxxxxxxxxxxx>
commit 4ea0bf4b98d66a7a790abb285539f395596bae92 upstream.
Libuv recently started using it so there is at least one consumer now.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 61a2732af4b0 ("io_uring: deprecate epoll_ctl support")
Link: https://github.com/libuv/libuv/pull/3979
Signed-off-by: Ben Noordhuis <info@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230506095502.13401-1-info@xxxxxxxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
io_uring/epoll.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/io_uring/epoll.c b/io_uring/epoll.c
index 9aa74d2c80bc..89bff2068a19 100644
--- a/io_uring/epoll.c
+++ b/io_uring/epoll.c
@@ -25,10 +25,6 @@ int io_epoll_ctl_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
struct io_epoll *epoll = io_kiocb_to_cmd(req, struct io_epoll);
- pr_warn_once("%s: epoll_ctl support in io_uring is deprecated and will "
- "be removed in a future Linux kernel version.\n",
- current->comm);
-
if (sqe->buf_index || sqe->splice_fd_in)
return -EINVAL;
--
2.41.0
Patches currently in stable-queue which might be from info@xxxxxxxxxxxxx are
queue-6.1/io_uring-undeprecate-epoll_ctl-support.patch
