From patchwork Fri Jun 5 10:55:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 481145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 889ED140218; Fri, 5 Jun 2015 20:55:34 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Z0pHZ-0005OY-Dv; Fri, 05 Jun 2015 10:55:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Z0pHU-0005OT-JY for kernel-team@lists.ubuntu.com; Fri, 05 Jun 2015 10:55:20 +0000 Received: from [10.172.192.212] (helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1Z0pHU-0000pn-Et; Fri, 05 Jun 2015 10:55:20 +0000 Date: Fri, 5 Jun 2015 11:55:19 +0100 From: Luis Henriques To: Brad Figg Subject: Re: APPLIED [utopic]: [RESEND][SRU][Utopic][PATCH 0/1] UBUNTU: [Config] Disable CONFIG_USB_OTG Message-ID: <20150605105519.GB2358@ares> References: <20150604154554.GF13106@sun> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150604154554.GF13106@sun> Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com On Thu, Jun 04, 2015 at 08:45:54AM -0700, Brad Figg wrote: > > Applied to Utopic master-next branch. > I've changed this commit to include a few extra changes to fix the build failure we were getting in master-next: II: Checking modules for generic... reading new modules...read 4131 modules. reading old modules... MISS: usb-otg-fsm read 4132 modules : new(0) missing(1) EE: Missing modules (start begging for mercy) Please find below the modified patch. I know I could just use the 'abi-disable' script, but that would mask other potential issues. Maybe we should always modify the *.modules files when we disable a config (as Andy suggested!). Cheers, --- Luís From 1b2cd7bed2075e8f531cc0ff0362700d5ff8b36c Mon Sep 17 00:00:00 2001 From: Luis Henriques Date: Fri, 5 Jun 2015 11:24:45 +0100 Subject: [PATCH] UBUNTU: [Config] Disable CONFIG_USB_OTG BugLink: http://bugs.launchpad.net/bugs/1411295 Also disables CONFIG_USB_OTG_FSM and CONFIG_USB_ZERO_HNPTEST Signed-off-by: Joseph Salisbury Acked-by: Tim Gardner Acked-by: Brad Figg Signed-off-by: Brad Figg [luis: remove reference to usb-otg-fsm module from abi *.modules files ] Signed-off-by: Luis Henriques --- debian.master/abi/3.16.0-39.53/amd64/generic.modules | 1 - debian.master/abi/3.16.0-39.53/amd64/lowlatency.modules | 1 - debian.master/abi/3.16.0-39.53/arm64/generic.modules | 1 - debian.master/abi/3.16.0-39.53/armhf/generic-lpae.modules | 1 - debian.master/abi/3.16.0-39.53/armhf/generic.modules | 1 - debian.master/abi/3.16.0-39.53/i386/generic.modules | 1 - debian.master/abi/3.16.0-39.53/i386/lowlatency.modules | 1 - debian.master/abi/3.16.0-39.53/powerpc/powerpc-e500mc.modules | 1 - debian.master/abi/3.16.0-39.53/powerpc/powerpc-smp.modules | 1 - debian.master/abi/3.16.0-39.53/powerpc/powerpc64-emb.modules | 1 - debian.master/abi/3.16.0-39.53/powerpc/powerpc64-smp.modules | 1 - debian.master/abi/3.16.0-39.53/ppc64el/generic.modules | 1 - debian.master/config/config.common.ubuntu | 6 ++---- 13 files changed, 2 insertions(+), 16 deletions(-) diff --git a/debian.master/abi/3.16.0-39.53/amd64/generic.modules b/debian.master/abi/3.16.0-39.53/amd64/generic.modules index 1c148ee886ae..d15386386a0c 100644 --- a/debian.master/abi/3.16.0-39.53/amd64/generic.modules +++ b/debian.master/abi/3.16.0-39.53/amd64/generic.modules @@ -3799,7 +3799,6 @@ usblp usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/amd64/lowlatency.modules b/debian.master/abi/3.16.0-39.53/amd64/lowlatency.modules index 67118153e98a..9c78c71ddd64 100644 --- a/debian.master/abi/3.16.0-39.53/amd64/lowlatency.modules +++ b/debian.master/abi/3.16.0-39.53/amd64/lowlatency.modules @@ -3798,7 +3798,6 @@ usblp usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/arm64/generic.modules b/debian.master/abi/3.16.0-39.53/arm64/generic.modules index e8b4a05cf1d4..409d4d248654 100644 --- a/debian.master/abi/3.16.0-39.53/arm64/generic.modules +++ b/debian.master/abi/3.16.0-39.53/arm64/generic.modules @@ -3473,7 +3473,6 @@ usbmisc_imx usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/armhf/generic-lpae.modules b/debian.master/abi/3.16.0-39.53/armhf/generic-lpae.modules index 07fd34bcef29..800c5f55293d 100644 --- a/debian.master/abi/3.16.0-39.53/armhf/generic-lpae.modules +++ b/debian.master/abi/3.16.0-39.53/armhf/generic-lpae.modules @@ -3635,7 +3635,6 @@ usblp usbmisc_imx usbmon usbmouse -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/armhf/generic.modules b/debian.master/abi/3.16.0-39.53/armhf/generic.modules index d8a82398fc2a..e2914aaccc42 100644 --- a/debian.master/abi/3.16.0-39.53/armhf/generic.modules +++ b/debian.master/abi/3.16.0-39.53/armhf/generic.modules @@ -3726,7 +3726,6 @@ usblp usbmisc_imx usbmon usbmouse -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/i386/generic.modules b/debian.master/abi/3.16.0-39.53/i386/generic.modules index da99dee32c50..1588c0785900 100644 --- a/debian.master/abi/3.16.0-39.53/i386/generic.modules +++ b/debian.master/abi/3.16.0-39.53/i386/generic.modules @@ -3966,7 +3966,6 @@ usblp usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/i386/lowlatency.modules b/debian.master/abi/3.16.0-39.53/i386/lowlatency.modules index e0715c4fa32e..860f57100f94 100644 --- a/debian.master/abi/3.16.0-39.53/i386/lowlatency.modules +++ b/debian.master/abi/3.16.0-39.53/i386/lowlatency.modules @@ -3965,7 +3965,6 @@ usblp usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/powerpc/powerpc-e500mc.modules b/debian.master/abi/3.16.0-39.53/powerpc/powerpc-e500mc.modules index cffdc06894ac..34f87f7b9eaf 100644 --- a/debian.master/abi/3.16.0-39.53/powerpc/powerpc-e500mc.modules +++ b/debian.master/abi/3.16.0-39.53/powerpc/powerpc-e500mc.modules @@ -3611,7 +3611,6 @@ usbmisc_imx usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/powerpc/powerpc-smp.modules b/debian.master/abi/3.16.0-39.53/powerpc/powerpc-smp.modules index 81f6fa4f4546..69f6640c5dd8 100644 --- a/debian.master/abi/3.16.0-39.53/powerpc/powerpc-smp.modules +++ b/debian.master/abi/3.16.0-39.53/powerpc/powerpc-smp.modules @@ -3602,7 +3602,6 @@ usbmisc_imx usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/powerpc/powerpc64-emb.modules b/debian.master/abi/3.16.0-39.53/powerpc/powerpc64-emb.modules index 7511cb60b63a..4a3df0f2d847 100644 --- a/debian.master/abi/3.16.0-39.53/powerpc/powerpc64-emb.modules +++ b/debian.master/abi/3.16.0-39.53/powerpc/powerpc64-emb.modules @@ -3577,7 +3577,6 @@ usbmisc_imx usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/powerpc/powerpc64-smp.modules b/debian.master/abi/3.16.0-39.53/powerpc/powerpc64-smp.modules index 6e279c74dda3..5fe6453aa887 100644 --- a/debian.master/abi/3.16.0-39.53/powerpc/powerpc64-smp.modules +++ b/debian.master/abi/3.16.0-39.53/powerpc/powerpc64-smp.modules @@ -3601,7 +3601,6 @@ usbmisc_imx usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/abi/3.16.0-39.53/ppc64el/generic.modules b/debian.master/abi/3.16.0-39.53/ppc64el/generic.modules index 5964fa765f48..bb916a5f7df9 100644 --- a/debian.master/abi/3.16.0-39.53/ppc64el/generic.modules +++ b/debian.master/abi/3.16.0-39.53/ppc64el/generic.modules @@ -3478,7 +3478,6 @@ usbmisc_imx usbmon usbmouse usbnet -usb-otg-fsm usbserial usb-serial-simple usbsevseg diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e16d314d7cbe..474a846a29c5 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2258,7 +2258,6 @@ CONFIG_FSL_RIO=y CONFIG_FSL_SOC=y CONFIG_FSL_SOC_BOOKE=y # CONFIG_FSL_ULI1575 is not set -# CONFIG_FSL_USB2_OTG is not set CONFIG_FSL_XGMAC_MDIO=y CONFIG_FSNOTIFY=y CONFIG_FS_ENET=m @@ -7451,9 +7450,9 @@ CONFIG_USB_OHCI_HCD_OMAP3=m CONFIG_USB_OHCI_HCD_PCI=y # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_OTG=y +# CONFIG_USB_OTG is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_OTG_FSM=m +# CONFIG_USB_OTG_FSM is not set # CONFIG_USB_OTG_WHITELIST is not set CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_PEGASUS=m @@ -7601,7 +7600,6 @@ CONFIG_USB_XUSBATM=m CONFIG_USB_YUREX=m CONFIG_USB_ZD1201=m CONFIG_USB_ZERO=m -CONFIG_USB_ZERO_HNPTEST=y CONFIG_USB_ZR364XX=m CONFIG_USELIB=y CONFIG_USER_NS=y