]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Oct 2021 13:36:27 +0000 (15:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Oct 2021 13:36:27 +0000 (15:36 +0200)
added patches:
partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch

queue-4.14/series [new file with mode: 0644]
queue-4.19/series [new file with mode: 0644]
queue-4.4/series [new file with mode: 0644]
queue-4.9/partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch [new file with mode: 0644]
queue-4.9/series [new file with mode: 0644]
queue-5.10/series [new file with mode: 0644]
queue-5.14/series [new file with mode: 0644]
queue-5.4/series [new file with mode: 0644]

diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644 (file)
index 0000000..1a426a5
--- /dev/null
@@ -0,0 +1 @@
+partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch
diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644 (file)
index 0000000..1a426a5
--- /dev/null
@@ -0,0 +1 @@
+partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch
diff --git a/queue-4.4/series b/queue-4.4/series
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/queue-4.9/partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch b/queue-4.9/partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch
new file mode 100644 (file)
index 0000000..32f128d
--- /dev/null
@@ -0,0 +1,36 @@
+From 4d1aa9112c8e6995ef2c8a76972c9671332ccfea Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 21 Sep 2021 16:34:42 +0200
+Subject: Partially revert "usb: Kconfig: using select for USB_COMMON dependency"
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+commit 4d1aa9112c8e6995ef2c8a76972c9671332ccfea upstream.
+
+This reverts commit cb9c1cfc86926d0e86d19c8e34f6c23458cd3478 for
+USB_LED_TRIG.  This config symbol has bool type and enables extra code
+in usb_common itself, not a separate driver.  Enabling it should not
+force usb_common to be built-in!
+
+Fixes: cb9c1cfc8692 ("usb: Kconfig: using select for USB_COMMON dependency")
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
+Link: https://lore.kernel.org/r/20210921143442.340087-1-carnil@debian.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/Kconfig |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/usb/Kconfig
++++ b/drivers/usb/Kconfig
+@@ -160,8 +160,7 @@ source "drivers/usb/gadget/Kconfig"
+ config USB_LED_TRIG
+       bool "USB LED Triggers"
+-      depends on LEDS_CLASS && LEDS_TRIGGERS
+-      select USB_COMMON
++      depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS
+       help
+         This option adds LED triggers for USB host and/or gadget activity.
diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644 (file)
index 0000000..1a426a5
--- /dev/null
@@ -0,0 +1 @@
+partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch
diff --git a/queue-5.10/series b/queue-5.10/series
new file mode 100644 (file)
index 0000000..e7b43f4
--- /dev/null
@@ -0,0 +1,2 @@
+partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch
+usb-chipidea-ci_hdrc_imx-also-search-for-phys-phandle.patch
diff --git a/queue-5.14/series b/queue-5.14/series
new file mode 100644 (file)
index 0000000..0f30271
--- /dev/null
@@ -0,0 +1,3 @@
+partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch
+usb-cdc-wdm-fix-check-for-wwan.patch
+usb-chipidea-ci_hdrc_imx-also-search-for-phys-phandle.patch
diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644 (file)
index 0000000..1a426a5
--- /dev/null
@@ -0,0 +1 @@
+partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch