move 5.4 queue back in place

diff --git a/tmp-5.4/net_sched-check-error-pointer-in-tcf_dump_walker.patch b/queue-5.4/net_sched-check-error-pointer-in-tcf_dump_walker.patch
similarity index 84%
rename from tmp-5.4/net_sched-check-error-pointer-in-tcf_dump_walker.patch
rename to queue-5.4/net_sched-check-error-pointer-in-tcf_dump_walker.patch
index 991e14fc1afb770125659a2e2035c29d8000fabe..c80ba667a4d3386e07a226355c1772f17de86942 100644 (file)
--- a/tmp-5.4/net_sched-check-error-pointer-in-tcf_dump_walker.patch
+++ b/queue-5.4/net_sched-check-error-pointer-in-tcf_dump_walker.patch
@@ -30,14 +30,12 @@ Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- net/sched/act_api.c | 2 ++
+ net/sched/act_api.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/net/sched/act_api.c b/net/sched/act_api.c
-index 17e5cd9ebd89..75132d0ca887 100644
 --- a/net/sched/act_api.c
 +++ b/net/sched/act_api.c
-@@ -231,6 +231,8 @@ static int tcf_dump_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
+@@ -231,6 +231,8 @@ static int tcf_dump_walker(struct tcf_id
                index++;
                if (index < s_i)
                        continue;
@@ -46,6 +44,3 @@ index 17e5cd9ebd89..75132d0ca887 100644
  
                if (jiffy_since &&
                    time_after(jiffy_since,
--- 
-2.30.2
-

diff --git a/tmp-5.4/series b/queue-5.4/series
similarity index 100%
rename from tmp-5.4/series
rename to queue-5.4/series

diff --git a/tmp-5.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch b/queue-5.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
similarity index 90%
rename from tmp-5.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
rename to queue-5.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
index 57d1942bdb342820e9846d82d24c67514c233861..0adfa556c540b9d72ce5121a4502c47384178aab 100644 (file)
--- a/tmp-5.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
+++ b/queue-5.4/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 6e81788a30c1..0eaca7a130c9 100644
 --- a/arch/x86/include/asm/proto.h
 +++ b/arch/x86/include/asm/proto.h
 @@ -4,6 +4,8 @@
@@ -48,6 +46,3 @@ index 6e81788a30c1..0eaca7a130c9 100644
  /* misc architecture specific prototypes */
  
  void syscall_init(void);
--- 
-2.30.2
-