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 fdd7273237753b17ff13f9ffc6985dcdff361da9..422c9f1912aa2b7e40526ea788a7a633084458c3 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 
 --- 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 08f684bd6ab6131fdc0e26afbb7d58fd6f002d04..f6e3e283bf46028c411af24502cc3840dee3913e 100644 (file)
--- 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 <bp@suse.de>
 Link: https://lkml.kernel.org/r/b76b4be3-cf66-f6b2-9a6c-3e7ef54f9845@web.de
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-