From: Greg Kroah-Hartman Date: Sat, 31 Jul 2021 06:18:16 +0000 (+0200) Subject: move back 5.10 queue X-Git-Tag: v5.4.137~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=591dbb0f0e611250da26f354b3535f6988f0d815;p=thirdparty%2Fkernel%2Fstable-queue.git move back 5.10 queue --- diff --git a/tmp-5.10/io_uring-fix-null-ptr-deref-in-io_sq_offload_start.patch b/queue-5.10/io_uring-fix-null-ptr-deref-in-io_sq_offload_start.patch similarity index 98% rename from tmp-5.10/io_uring-fix-null-ptr-deref-in-io_sq_offload_start.patch rename to queue-5.10/io_uring-fix-null-ptr-deref-in-io_sq_offload_start.patch index fdd72732377..422c9f1912a 100644 --- a/tmp-5.10/io_uring-fix-null-ptr-deref-in-io_sq_offload_start.patch +++ b/queue-5.10/io_uring-fix-null-ptr-deref-in-io_sq_offload_start.patch @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/fs/io_uring.c +++ b/fs/io_uring.c -@@ -7998,7 +7998,7 @@ static void io_sq_offload_start(struct i +@@ -7997,7 +7997,7 @@ static void io_sq_offload_start(struct i struct io_sq_data *sqd = ctx->sq_data; ctx->flags &= ~IORING_SETUP_R_DISABLED; diff --git a/tmp-5.10/series b/queue-5.10/series similarity index 100% rename from tmp-5.10/series rename to queue-5.10/series diff --git a/tmp-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch b/queue-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch similarity index 90% rename from tmp-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch rename to queue-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch index 08f684bd6ab..f6e3e283bf4 100644 --- a/tmp-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch +++ b/queue-5.10/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch @@ -32,11 +32,9 @@ Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/b76b4be3-cf66-f6b2-9a6c-3e7ef54f9845@web.de Signed-off-by: Sasha Levin --- - arch/x86/include/asm/proto.h | 2 ++ + arch/x86/include/asm/proto.h | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h -index b6a9d51d1d79..8c5d1910a848 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -4,6 +4,8 @@ @@ -48,6 +46,3 @@ index b6a9d51d1d79..8c5d1910a848 100644 /* misc architecture specific prototypes */ void syscall_init(void); --- -2.30.2 -