From: Greg Kroah-Hartman Date: Sat, 9 Oct 2021 13:36:27 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.14.12~47 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57c19911a993f3eeb18b5660f54fb0dcec8422b4;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch --- diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..1a426a5c648 --- /dev/null +++ b/queue-4.14/series @@ -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 index 00000000000..1a426a5c648 --- /dev/null +++ b/queue-4.19/series @@ -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 index 00000000000..e69de29bb2d 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 index 00000000000..32f128d2718 --- /dev/null +++ b/queue-4.9/partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch @@ -0,0 +1,36 @@ +From 4d1aa9112c8e6995ef2c8a76972c9671332ccfea Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Tue, 21 Sep 2021 16:34:42 +0200 +Subject: Partially revert "usb: Kconfig: using select for USB_COMMON dependency" + +From: Ben Hutchings + +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 +Signed-off-by: Ben Hutchings +Signed-off-by: Salvatore Bonaccorso +Link: https://lore.kernel.org/r/20210921143442.340087-1-carnil@debian.org +Signed-off-by: Greg Kroah-Hartman +--- + 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 index 00000000000..1a426a5c648 --- /dev/null +++ b/queue-4.9/series @@ -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 index 00000000000..e7b43f47f3c --- /dev/null +++ b/queue-5.10/series @@ -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 index 00000000000..0f30271f0c2 --- /dev/null +++ b/queue-5.14/series @@ -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 index 00000000000..1a426a5c648 --- /dev/null +++ b/queue-5.4/series @@ -0,0 +1 @@ +partially-revert-usb-kconfig-using-select-for-usb_common-dependency.patch