4.14-stable patches

added patches:
	s390-speculation-fix-build-error-caused-by-bad-backport.patch

diff --git a/queue-4.14/s390-speculation-fix-build-error-caused-by-bad-backport.patch b/queue-4.14/s390-speculation-fix-build-error-caused-by-bad-backport.patch
new file mode 100644 (file)
index 0000000..1575015
--- /dev/null
+++ b/queue-4.14/s390-speculation-fix-build-error-caused-by-bad-backport.patch
@@ -0,0 +1,31 @@
+From linux@roeck-us.net  Wed May 15 18:41:33 2019
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Wed, 15 May 2019 09:26:38 -0700
+Subject: s390/speculation: Fix build error caused by bad backport
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, shuah@kernel.org, patches@kernelci.org, ben.hutchings@codethink.co.uk, lkft-triage@lists.linaro.org, stable@vger.kernel.org
+Message-ID: <20190515162638.GA25612@roeck-us.net>
+Content-Disposition: inline
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+The backport of commit 0336e04a6520 ("s390/speculation: Support
+'mitigations=' cmdline option") introduces a build error. Fix it up.
+
+Fixes: 91788fcb21d0 ("s390/speculation: Support 'mitigations=' cmdline option")
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/s390/kernel/nospec-branch.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/s390/kernel/nospec-branch.c
++++ b/arch/s390/kernel/nospec-branch.c
+@@ -66,6 +66,7 @@ void __init nospec_auto_detect(void)
+               if (IS_ENABLED(CC_USING_EXPOLINE))
+                       nospec_disable = 1;
+               __clear_facility(82, S390_lowcore.alt_stfle_fac_list);
++      }
+       if (IS_ENABLED(CC_USING_EXPOLINE)) {
+               /*
+                * The kernel has been compiled with expolines.

diff --git a/queue-4.14/series b/queue-4.14/series
index fa8709c5c8e123ebb66f73f77db341f02c6d8aa7..51551535488dab0cb4143c06c74969d946439955 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -112,3 +112,4 @@ drivers-virt-fsl_hypervisor.c-dereferencing-error-pointers-in-ioctl.patch
 drivers-virt-fsl_hypervisor.c-prevent-integer-overflow-in-ioctl.patch
 powerpc-powernv-idle-restore-iamr-after-idle.patch
 powerpc-booke64-set-ri-in-default-msr.patch
+s390-speculation-fix-build-error-caused-by-bad-backport.patch