4.4-stable patches

added patches:
	revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch
	x86-spectre-fix-an-error-message.patch

diff --git a/queue-4.4/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch b/queue-4.4/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch
new file mode 100644 (file)
index 0000000..d6e393c
--- /dev/null
+++ b/queue-4.4/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch
@@ -0,0 +1,35 @@
+From ben.hutchings@codethink.co.uk  Thu Mar  8 09:31:04 2018
+From: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Date: Thu, 8 Mar 2018 15:59:07 +0000
+Subject: Revert "led: core: Fix brightness setting when setting delay_off=0"
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>, Matthieu CASTET <matthieu.castet@parrot.com>, stable@vger.kernel.org
+Message-ID: <20180308155906.5zaldlnuxvxmh2wo@xylophone.i.decadent.org.uk>
+Content-Disposition: inline
+
+From: Ben Hutchings <ben.hutchings@codethink.co.uk>
+
+This reverts commit 20ac8f72514b3af8b62c520d55656ded865eff00, which
+was commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c upstream.
+The bug that it should fix was only introduced in Linux 4.7, and
+in 4.4 it causes a regression.
+
+Reported-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
+Cc: Matthieu CASTET <matthieu.castet@parrot.com>
+Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/leds/led-core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/leds/led-core.c
++++ b/drivers/leds/led-core.c
+@@ -149,7 +149,7 @@ void led_blink_set(struct led_classdev *
+                  unsigned long *delay_on,
+                  unsigned long *delay_off)
+ {
+-      led_stop_software_blink(led_cdev);
++      del_timer_sync(&led_cdev->blink_timer);
+ 
+       led_cdev->flags &= ~LED_BLINK_ONESHOT;
+       led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;

diff --git a/queue-4.4/series b/queue-4.4/series
index 0d799bd6ec5edfe921b69f111df0c9ae8925d209..abe73597be5cd4d67664a0e70bb817a65cef2fbb 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -13,3 +13,5 @@ btrfs-don-t-clear-sgid-when-inheriting-acls.patch
 arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch
 x86-apic-vector-handle-legacy-irq-data-correctly.patch
 leds-do-not-overflow-sysfs-buffer-in-led_trigger_show.patch
+x86-spectre-fix-an-error-message.patch
+revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch

diff --git a/queue-4.4/x86-spectre-fix-an-error-message.patch b/queue-4.4/x86-spectre-fix-an-error-message.patch
new file mode 100644 (file)
index 0000000..54b26c8
--- /dev/null
+++ b/queue-4.4/x86-spectre-fix-an-error-message.patch
@@ -0,0 +1,44 @@
+From 9de29eac8d2189424d81c0d840cd0469aa3d41c8 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Wed, 14 Feb 2018 10:14:17 +0300
+Subject: x86/spectre: Fix an error message
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit 9de29eac8d2189424d81c0d840cd0469aa3d41c8 upstream.
+
+If i == ARRAY_SIZE(mitigation_options) then we accidentally print
+garbage from one space beyond the end of the mitigation_options[] array.
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Cc: Andy Lutomirski <luto@kernel.org>
+Cc: Borislav Petkov <bp@suse.de>
+Cc: David Woodhouse <dwmw@amazon.co.uk>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: KarimAllah Ahmed <karahmed@amazon.de>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: kernel-janitors@vger.kernel.org
+Fixes: 9005c6834c0f ("x86/spectre: Simplify spectre_v2 command line parsing")
+Link: http://lkml.kernel.org/r/20180214071416.GA26677@mwanda
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/cpu/bugs.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/x86/kernel/cpu/bugs.c
++++ b/arch/x86/kernel/cpu/bugs.c
+@@ -175,8 +175,7 @@ static enum spectre_v2_mitigation_cmd __
+               }
+ 
+               if (i >= ARRAY_SIZE(mitigation_options)) {
+-                      pr_err("unknown option (%s). Switching to AUTO select\n",
+-                             mitigation_options[i].option);
++                      pr_err("unknown option (%s). Switching to AUTO select\n", arg);
+                       return SPECTRE_V2_CMD_AUTO;
+               }
+       }