summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-23 08:51:23 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-23 08:51:23 -0400
commit5b0069474d4b569788679e1b02d4f7e76f8c49a4 (patch)
tree9a60270b111ff4aeeeeda2a50301656bade037ce
parent29c7d69ce7fffb4bacfdc1d477f93b46b5d86c16 (diff)
downloadlongterm-queue-5.2-5b0069474d4b569788679e1b02d4f7e76f8c49a4.tar.gz
re-export commits with SOB lines added
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/Linux-5.2.57.patch2
-rw-r--r--queue/arm64-workaround-circular-dependency-in-pointer_auth.h.patch16
-rw-r--r--queue/ext4-fix-direct-i-o-read-error.patch2
-rw-r--r--queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch2
-rw-r--r--queue/vgacon-Fix-for-missing-check-in-scrollback-handling.patch5
5 files changed, 16 insertions, 11 deletions
diff --git a/queue/Linux-5.2.57.patch b/queue/Linux-5.2.57.patch
index 24e65cac..0626856b 100644
--- a/queue/Linux-5.2.57.patch
+++ b/queue/Linux-5.2.57.patch
@@ -1,4 +1,4 @@
-From 4e0181c318ace24b0bd303c8f9c1eca82499fd0b Mon Sep 17 00:00:00 2001
+From 778d54f394d635788e24c41f95bac9b75cff344a Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sat, 22 Aug 2020 09:33:26 -0400
Subject: [PATCH] Linux 5.2.57
diff --git a/queue/arm64-workaround-circular-dependency-in-pointer_auth.h.patch b/queue/arm64-workaround-circular-dependency-in-pointer_auth.h.patch
index aa201c19..237aa25b 100644
--- a/queue/arm64-workaround-circular-dependency-in-pointer_auth.h.patch
+++ b/queue/arm64-workaround-circular-dependency-in-pointer_auth.h.patch
@@ -1,9 +1,10 @@
-From 34ee193a4a84718689cffd13f976b7f31e4c5ad4 Mon Sep 17 00:00:00 2001
+From a0467176dd656f77cffb4b99409fa4cb9bda7e34 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <maz@kernel.org>
Date: Wed, 5 Aug 2020 12:10:44 +0100
Subject: [PATCH] arm64: Workaround circular dependency in pointer_auth.h
-
-From: Marc Zyngier <maz@kernel.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
With the backport of f227e3ec3b5c ("random32: update the net random
state on interrupt and activity") and its associated fixes, the
@@ -37,10 +38,10 @@ type has been defined.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/include/asm/pointer_auth.h | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+diff --git a/arch/arm64/include/asm/pointer_auth.h b/arch/arm64/include/asm/pointer_auth.h
+index d328540cb85e..a7ac50fb5abc 100644
--- a/arch/arm64/include/asm/pointer_auth.h
+++ b/arch/arm64/include/asm/pointer_auth.h
@@ -3,7 +3,6 @@
@@ -65,3 +66,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
static inline void ptrauth_keys_init(struct ptrauth_keys *keys)
{
if (system_supports_address_auth()) {
+--
+2.27.0
+
diff --git a/queue/ext4-fix-direct-i-o-read-error.patch b/queue/ext4-fix-direct-i-o-read-error.patch
index a8987dac..de6cdc07 100644
--- a/queue/ext4-fix-direct-i-o-read-error.patch
+++ b/queue/ext4-fix-direct-i-o-read-error.patch
@@ -1,4 +1,4 @@
-From dd49b4c626493b0856ec269fc343e1e9569a63f3 Mon Sep 17 00:00:00 2001
+From 1e2e500d16ef7388fb6b7ba41a990a95177fa483 Mon Sep 17 00:00:00 2001
From: Jiang Ying <jiangying8582@126.com>
Date: Wed, 5 Aug 2020 15:57:21 +0800
Subject: [PATCH] ext4: fix direct I/O read error
diff --git a/queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch b/queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch
index 32d5756e..e3f99640 100644
--- a/queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch
+++ b/queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch
@@ -1,4 +1,4 @@
-From a292bb0a6cc199c195306b97764febffe35c6d1a Mon Sep 17 00:00:00 2001
+From fa9578aa372f6bbb919a0775b4449fccf8b303bb Mon Sep 17 00:00:00 2001
From: Lorenz Bauer <lmb@cloudflare.com>
Date: Thu, 9 Jul 2020 12:51:51 +0100
Subject: [PATCH] selftests: bpf: Fix detach from sockmap tests
diff --git a/queue/vgacon-Fix-for-missing-check-in-scrollback-handling.patch b/queue/vgacon-Fix-for-missing-check-in-scrollback-handling.patch
index f97d6145..21b90f87 100644
--- a/queue/vgacon-Fix-for-missing-check-in-scrollback-handling.patch
+++ b/queue/vgacon-Fix-for-missing-check-in-scrollback-handling.patch
@@ -1,4 +1,4 @@
-From ebfdfeeae8c01fcb2b3b74ffaf03876e20835d2d Mon Sep 17 00:00:00 2001
+From a63f9e849f75c22b3f63991ce61a81407f527352 Mon Sep 17 00:00:00 2001
From: Yunhai Zhang <zhangyunhai@nsfocus.com>
Date: Tue, 28 Jul 2020 09:58:03 +0800
Subject: [PATCH] vgacon: Fix for missing check in scrollback handling
@@ -66,9 +66,10 @@ Cc: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Yunhai Zhang <zhangyunhai@nsfocus.com>
Link: https://lore.kernel.org/r/9fb43895-ca91-9b07-ebfd-808cf854ca95@nsfocus.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
-index f0f3d573f848..a52bb3740073 100644
+index bfaa9ec4bc1f..e079b910feb2 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -251,6 +251,10 @@ static void vgacon_scrollback_update(struct vc_data *c, int t, int count)