[linux] 15/16: Partially revert "usb: Kconfig: using select for USB_COMMON dependency"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 2ebf1235ed6f6143817020a7e388eb2f461e4a75
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Jan 11 04:34:58 2017 +0000

    Partially revert "usb: Kconfig: using select for USB_COMMON dependency"
    
    It causes USB_COMMON to be built-in for no good reason.
---
 debian/changelog                                   |  2 ++
 ...evert-usb-kconfig-using-select-for-usb_co.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 298913a..4ac3d9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ linux (4.9.2-1~exp1) UNRELEASED; urgency=medium
   * drm: Enable DRM_LEGACY; re-enable DRM_TDFX, DRM_R128, DRM_MGA, DRM_SIS,
     DRM_VIA, DRM_SAVAGE as modules for some architectures
   * 8250: Disable SERIAL_8250_LPSS, since it causes DW_DMAC_CORE to be built-in
+  * Partially revert "usb: Kconfig: using select for USB_COMMON dependency",
+    since it causes USB_COMMON to be built-in
 
   [ John Paul Adrian Glaubitz ]
   * [sh3] Build a linux-libc-dev package (Closes: #850732)
diff --git a/debian/patches/bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch b/debian/patches/bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
new file mode 100644
index 0000000..da62e63
--- /dev/null
+++ b/debian/patches/bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
@@ -0,0 +1,28 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 11 Jan 2017 04:30:40 +0000
+Subject: Partially revert "usb: Kconfig: using select for USB_COMMON  dependency"
+
+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!
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/usb/Kconfig | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
+index 644e978cbd3e..989c6208678f 100644
+--- a/drivers/usb/Kconfig
++++ b/drivers/usb/Kconfig
+@@ -152,8 +152,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/debian/patches/series b/debian/patches/series
index e70f660..4682eea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,6 +63,7 @@ bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
 bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
 bugfix/all/ext4-fix-bug-838544.patch
 bugfix/all/mm-memcontrol-use-special-workqueue-for-creating-per-memcg-caches.patch
+bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
 
 # Miscellaneous features
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git