5.7-stable patches

added patches:
	random-random.h-should-include-archrandom.h-not-the-other-way-around.patch

diff --git a/queue-5.7/random-random.h-should-include-archrandom.h-not-the-other-way-around.patch b/queue-5.7/random-random.h-should-include-archrandom.h-not-the-other-way-around.patch
new file mode 100644 (file)
index 0000000..b3d508c
--- /dev/null
+++ b/queue-5.7/random-random.h-should-include-archrandom.h-not-the-other-way-around.patch
@@ -0,0 +1,49 @@
+From 585524081ecdcde1c719e63916c514866d898217 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Wed, 5 Aug 2020 12:39:48 -0700
+Subject: random: random.h should include archrandom.h, not the other way around
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit 585524081ecdcde1c719e63916c514866d898217 upstream.
+
+This is hopefully the final piece of the crazy puzzle with random.h
+dependencies.
+
+And by "hopefully" I obviously mean "Linus is a hopeless optimist".
+
+Reported-and-tested-by: Daniel Díaz <daniel.diaz@linaro.org>
+Acked-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/include/asm/archrandom.h |    1 -
+ arch/arm64/kernel/kaslr.c           |    2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/arm64/include/asm/archrandom.h
++++ b/arch/arm64/include/asm/archrandom.h
+@@ -6,7 +6,6 @@
+ 
+ #include <linux/bug.h>
+ #include <linux/kernel.h>
+-#include <linux/random.h>
+ #include <asm/cpufeature.h>
+ 
+ static inline bool __arm64_rndr(unsigned long *v)
+--- a/arch/arm64/kernel/kaslr.c
++++ b/arch/arm64/kernel/kaslr.c
+@@ -10,8 +10,8 @@
+ #include <linux/mm_types.h>
+ #include <linux/sched.h>
+ #include <linux/types.h>
++#include <linux/random.h>
+ 
+-#include <asm/archrandom.h>
+ #include <asm/cacheflush.h>
+ #include <asm/fixmap.h>
+ #include <asm/kernel-pgtable.h>

diff --git a/queue-5.7/series b/queue-5.7/series
index c8e9801b9f2bec5f21b71be91bd3cc260f451c2b..6d12731910973ac910f53d0ba0ce6ee172df56a9 100644 (file)
--- a/queue-5.7/series
+++ b/queue-5.7/series
@@ -4,3 +4,4 @@ random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch
 random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch
 random32-move-the-pseudo-random-32-bit-definitions-to-prandom.h.patch
 arm64-workaround-circular-dependency-in-pointer_auth.h.patch
+random-random.h-should-include-archrandom.h-not-the-other-way-around.patch