summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2023-06-02 11:07:00 -0400
committerMike Pagano <mpagano@gentoo.org>2023-06-02 11:07:00 -0400
commit02b803e1a984fd5e611a5146f52aef31b7a523c0 (patch)
tree37a34aabdce76842fac20e3c0ce05385252331dc
parentLinux patch 6.1.31 (diff)
downloadlinux-patches-02b803e1a984fd5e611a5146f52aef31b7a523c0.tar.gz
linux-patches-02b803e1a984fd5e611a5146f52aef31b7a523c0.tar.bz2
linux-patches-02b803e1a984fd5e611a5146f52aef31b7a523c0.zip
io_uring: undeprecate epoll_ctl support
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
-rw-r--r--0000_README4
-rw-r--r--2100_io-uring-undeprecate-epoll-ctl-support.patch21
2 files changed, 25 insertions, 0 deletions
diff --git a/0000_README b/0000_README
index 68130982..f6e14669 100644
--- a/0000_README
+++ b/0000_README
@@ -179,6 +179,10 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw
Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
+Patch: 2100_io-uring-undeprecate-epoll-ctl-support.patch
+From: https://patchwork.kernel.org/project/io-uring/patch/20230506095502.13401-1-info@bnoordhuis.nl/
+Desc: io_uring: undeprecate epoll_ctl support
+
Patch: 2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch
From: https://bugs.gentoo.org/710790
Desc: tmp513 requies REGMAP_I2C to build. Select it by default in Kconfig. See bug #710790. Thanks to Phil Stracchino
diff --git a/2100_io-uring-undeprecate-epoll-ctl-support.patch b/2100_io-uring-undeprecate-epoll-ctl-support.patch
new file mode 100644
index 00000000..4c3d3904
--- /dev/null
+++ b/2100_io-uring-undeprecate-epoll-ctl-support.patch
@@ -0,0 +1,21 @@
+io_uring: undeprecate epoll_ctl support
+
+---
+ 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;
+