fix up 6.4 io_uring stuff

diff --git a/queue-6.4/io_uring-wait-interruptibly-for-request-completions-on-exit.patch b/queue-6.4/io_uring-wait-interruptibly-for-request-completions-on-exit.patch
index 86c09d1e66f167bf224cdbd15042490389a5db1a..b426c9c718d8a473aa56a8eaab0b17d045fb9702 100644 (file)
--- a/queue-6.4/io_uring-wait-interruptibly-for-request-completions-on-exit.patch
+++ b/queue-6.4/io_uring-wait-interruptibly-for-request-completions-on-exit.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/io_uring/io_uring.c
 +++ b/io_uring/io_uring.c
-@@ -3061,7 +3061,18 @@ static __cold void io_ring_exit_work(str
+@@ -3050,7 +3050,18 @@ static __cold void io_ring_exit_work(str
                        /* there is little hope left, don't run it too often */
                        interval = HZ * 60;
                }
@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        init_completion(&exit.completion);
        init_task_work(&exit.task_work, io_tctx_exit_cb);
-@@ -3085,7 +3096,12 @@ static __cold void io_ring_exit_work(str
+@@ -3074,7 +3085,12 @@ static __cold void io_ring_exit_work(str
                        continue;
  
                mutex_unlock(&ctx->uring_lock);

diff --git a/queue-6.4/series b/queue-6.4/series
index 5f99f82d99fbad75ba04761a32bf9880315694bc..4210f2bdd17c102a9477f505e9b623c4a4aa9df5 100644 (file)
--- a/queue-6.4/series
+++ b/queue-6.4/series
@@ -797,3 +797,4 @@ netfilter-nf_tables-prevent-oob-access-in-nft_byteorder_eval.patch
 wireguard-queueing-use-saner-cpu-selection-wrapping.patch
 wireguard-netlink-send-staged-packets-when-setting-initial-private-key.patch
 tty-serial-fsl_lpuart-add-earlycon-for-imx8ulp-platform.patch
+io_uring-use-io_schedule-in-cqring-wait.patch