5.4-stable patches

added patches:
	init-kconfig-make-compile_test-depend-on-has_iomem.patch
	init-kconfig-make-compile_test-depend-on-s390.patch

diff --git a/queue-5.4/init-kconfig-make-compile_test-depend-on-has_iomem.patch b/queue-5.4/init-kconfig-make-compile_test-depend-on-has_iomem.patch
new file mode 100644 (file)
index 0000000..be3a40b
--- /dev/null
+++ b/queue-5.4/init-kconfig-make-compile_test-depend-on-has_iomem.patch
@@ -0,0 +1,60 @@
+From ea29b20a828511de3348334e529a3d046a180416 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <masahiroy@kernel.org>
+Date: Fri, 12 Mar 2021 21:07:08 -0800
+Subject: init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
+
+From: Masahiro Yamada <masahiroy@kernel.org>
+
+commit ea29b20a828511de3348334e529a3d046a180416 upstream.
+
+I read the commit log of the following two:
+
+- bc083a64b6c0 ("init/Kconfig: make COMPILE_TEST depend on !UML")
+- 334ef6ed06fa ("init/Kconfig: make COMPILE_TEST depend on !S390")
+
+Both are talking about HAS_IOMEM dependency missing in many drivers.
+
+So, 'depends on HAS_IOMEM' seems the direct, sensible solution to me.
+
+This does not change the behavior of UML. UML still cannot enable
+COMPILE_TEST because it does not provide HAS_IOMEM.
+
+The current dependency for S390 is too strong. Under the condition of
+CONFIG_PCI=y, S390 provides HAS_IOMEM, hence can enable COMPILE_TEST.
+
+I also removed the meaningless 'default n'.
+
+Link: https://lkml.kernel.org/r/20210224140809.1067582-1-masahiroy@kernel.org
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Cc: Heiko Carstens <hca@linux.ibm.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Cc: Arnd Bergmann <arnd@kernel.org>
+Cc: Kees Cook <keescook@chromium.org>
+Cc: Daniel Borkmann <daniel@iogearbox.net>
+Cc: Johannes Weiner <hannes@cmpxchg.org>
+Cc: KP Singh <kpsingh@google.com>
+Cc: Nathan Chancellor <nathan@kernel.org>
+Cc: Nick Terrell <terrelln@fb.com>
+Cc: Quentin Perret <qperret@google.com>
+Cc: Valentin Schneider <valentin.schneider@arm.com>
+Cc: "Enrico Weigelt, metux IT consult" <lkml@metux.net>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ init/Kconfig |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -76,8 +76,7 @@ config INIT_ENV_ARG_LIMIT
+ 
+ config COMPILE_TEST
+       bool "Compile also drivers which will not load"
+-      depends on !UML && !S390
+-      default n
++      depends on HAS_IOMEM
+       help
+         Some drivers can be compiled on a different platform than they are
+         intended to be run on. Despite they cannot be loaded there (or even

diff --git a/queue-5.4/init-kconfig-make-compile_test-depend-on-s390.patch b/queue-5.4/init-kconfig-make-compile_test-depend-on-s390.patch
new file mode 100644 (file)
index 0000000..c2951cd
--- /dev/null
+++ b/queue-5.4/init-kconfig-make-compile_test-depend-on-s390.patch
@@ -0,0 +1,39 @@
+From 334ef6ed06fa1a54e35296b77b693bcf6d63ee9e Mon Sep 17 00:00:00 2001
+From: Heiko Carstens <hca@linux.ibm.com>
+Date: Wed, 18 Nov 2020 21:32:33 +0100
+Subject: init/Kconfig: make COMPILE_TEST depend on !S390
+
+From: Heiko Carstens <hca@linux.ibm.com>
+
+commit 334ef6ed06fa1a54e35296b77b693bcf6d63ee9e upstream.
+
+While allmodconfig and allyesconfig build for s390 there are also
+various bots running compile tests with randconfig, where PCI is
+disabled. This reveals that a lot of drivers should actually depend on
+HAS_IOMEM.
+Adding this to each device driver would be a never ending story,
+therefore just disable COMPILE_TEST for s390.
+
+The reasoning is more or less the same as described in
+commit bc083a64b6c0 ("init/Kconfig: make COMPILE_TEST depend on !UML").
+
+Reported-by: kernel test robot <lkp@intel.com>
+Suggested-by: Arnd Bergmann <arnd@kernel.org>
+Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ init/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -76,7 +76,7 @@ config INIT_ENV_ARG_LIMIT
+ 
+ config COMPILE_TEST
+       bool "Compile also drivers which will not load"
+-      depends on !UML
++      depends on !UML && !S390
+       default n
+       help
+         Some drivers can be compiled on a different platform than they are

diff --git a/queue-5.4/series b/queue-5.4/series
index 05c5945c12bdb5aef471659c8adcf7fa160210e0..9474ddefa65f02a96f7581cdec2fcfd8230c3c28 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -19,3 +19,5 @@ cifs-silently-ignore-unknown-oplock-break-handle.patch
 bpf-x86-validate-computation-of-branch-displacements-for-x86-64.patch
 bpf-x86-validate-computation-of-branch-displacements-for-x86-32.patch
 nvme-mpath-replace-direct_make_request-with-generic_make_request.patch
+init-kconfig-make-compile_test-depend-on-s390.patch
+init-kconfig-make-compile_test-depend-on-has_iomem.patch