UBUNTU: [Config] update configs and annotations after rebase to 5.11-rc5

Also drop CONFIG_USB_BDC_PCI from annotations, since this driver has been
marked as BROKEN by:

 ef02684c4e67 ("usb: bdc: Make bdc pci driver depend on BROKEN")

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/debian.master/abi/5.11.0-5.6/amd64/generic.modules b/debian.master/abi/5.11.0-5.6/amd64/generic.modules
index e4610dea7c0064610293a4cca5a30e401d965b38..661e79120ff8d8dd72b4263ee9aaf741d01c6592 100644 (file)
--- a/debian.master/abi/5.11.0-5.6/amd64/generic.modules
+++ b/debian.master/abi/5.11.0-5.6/amd64/generic.modules
@@ -550,7 +550,6 @@ bd9571mwv
 bd9571mwv-regulator
 bd99954-charger
 bdc
-bdc_pci
 be2iscsi
 be2net
 befs

diff --git a/debian.master/abi/5.11.0-5.6/amd64/lowlatency.modules b/debian.master/abi/5.11.0-5.6/amd64/lowlatency.modules
index b51888afc119df5aba30f36e19e922c11b5a874e..db7a2bcb7f583338067c2c085255a6e767bb3ab0 100644 (file)
--- a/debian.master/abi/5.11.0-5.6/amd64/lowlatency.modules
+++ b/debian.master/abi/5.11.0-5.6/amd64/lowlatency.modules
@@ -550,7 +550,6 @@ bd9571mwv
 bd9571mwv-regulator
 bd99954-charger
 bdc
-bdc_pci
 be2iscsi
 be2net
 befs

diff --git a/debian.master/abi/5.11.0-5.6/arm64/generic-64k.modules b/debian.master/abi/5.11.0-5.6/arm64/generic-64k.modules
index 03ce44a0f2c4812c73fe31082b518c946b8afe36..5638edfc12ec2d8cb2e80a7e7e2a2cd2fa4a5d49 100644 (file)
--- a/debian.master/abi/5.11.0-5.6/arm64/generic-64k.modules
+++ b/debian.master/abi/5.11.0-5.6/arm64/generic-64k.modules
@@ -576,7 +576,6 @@ bd9571mwv
 bd9571mwv-regulator
 bd99954-charger
 bdc
-bdc_pci
 be2iscsi
 be2net
 befs

diff --git a/debian.master/abi/5.11.0-5.6/arm64/generic.modules b/debian.master/abi/5.11.0-5.6/arm64/generic.modules
index 82e850e7b094a3fdfcdfef17e5883f4d0029b5fe..26b95f726629c1d07beb0381d572bd5962c828ab 100644 (file)
--- a/debian.master/abi/5.11.0-5.6/arm64/generic.modules
+++ b/debian.master/abi/5.11.0-5.6/arm64/generic.modules
@@ -576,7 +576,6 @@ bd9571mwv
 bd9571mwv-regulator
 bd99954-charger
 bdc
-bdc_pci
 be2iscsi
 be2net
 befs

diff --git a/debian.master/abi/5.11.0-5.6/armhf/generic-lpae.modules b/debian.master/abi/5.11.0-5.6/armhf/generic-lpae.modules
index 2beb89ee90d72e21172c1eb4bad46deb5068375d..08cb2a2099e0ee0f3da57f932a98a1202a08ded7 100644 (file)
--- a/debian.master/abi/5.11.0-5.6/armhf/generic-lpae.modules
+++ b/debian.master/abi/5.11.0-5.6/armhf/generic-lpae.modules
@@ -553,7 +553,6 @@ bd9571mwv
 bd9571mwv-regulator
 bd99954-charger
 bdc
-bdc_pci
 be2iscsi
 be2net
 befs

diff --git a/debian.master/abi/5.11.0-5.6/armhf/generic.modules b/debian.master/abi/5.11.0-5.6/armhf/generic.modules
index f94f4c15d16d2f9a17e4c78582b6d820b89c72b0..5f12b801f0372426fc6d5268b95d7e3e7349b448 100644 (file)
--- a/debian.master/abi/5.11.0-5.6/armhf/generic.modules
+++ b/debian.master/abi/5.11.0-5.6/armhf/generic.modules
@@ -555,7 +555,6 @@ bd9571mwv
 bd9571mwv-regulator
 bd99954-charger
 bdc
-bdc_pci
 be2iscsi
 be2net
 befs

diff --git a/debian.master/abi/5.11.0-5.6/ppc64el/generic.modules b/debian.master/abi/5.11.0-5.6/ppc64el/generic.modules
index 3f1b2604e9ff0ddd18146c8fb1fa096cb743d26b..9dc1cd6d103fbbfe0b77bbaee2b6fbeddaba372f 100644 (file)
--- a/debian.master/abi/5.11.0-5.6/ppc64el/generic.modules
+++ b/debian.master/abi/5.11.0-5.6/ppc64el/generic.modules
@@ -508,7 +508,6 @@ bd9571mwv
 bd9571mwv-regulator
 bd99954-charger
 bdc
-bdc_pci
 be2iscsi
 be2net
 befs

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 2041df4595caee5b5c4b177744829fbdd02bb13f..97316e16cc88ec049926ddc41b795e3b8f636383 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -594,7 +594,6 @@ CONFIG_STAGING=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SURFACE_3_BUTTON=m
 CONFIG_SURFACE_3_POWER_OPREGION=m
-CONFIG_SURFACE_PLATFORMS=y
 CONFIG_SURFACE_PRO3_BUTTON=m
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 4b48a290bf76210f91adcec494bf7db8d4494738..08a23a4ed6bddf3ee917f3ca1521f26240743163 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9565,7 +9565,6 @@ CONFIG_USB_MV_U3D                               policy<{'amd64': 'm', 'arm64': '
 CONFIG_USB_SNP_UDC_PLAT                         policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_USB_M66592                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
 CONFIG_USB_BDC_UDC                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_USB_BDC_PCI                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_USB_AMD5536UDC                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_USB_NET2272                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_USB_NET2272_DMA                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index e332cce2c46823eb9acadb8235de745d1f03ec36..bc295c4ade3321f3f7195c2095906029bfb09b3a 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -631,7 +631,6 @@ CONFIG_STANDALONE=y
 CONFIG_SUN_PARTITION=y
 # CONFIG_SURFACE_3_BUTTON is not set
 # CONFIG_SURFACE_3_POWER_OPREGION is not set
-CONFIG_SURFACE_PLATFORMS=y
 # CONFIG_SURFACE_PRO3_BUTTON is not set
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index ecbe3beeb587c3c1a5bd88a49a0dbdda698cc896..fec89a72383240299650d245de30cc941878ae51 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -602,7 +602,6 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_SUN_PARTITION=y
-CONFIG_SURFACE_PLATFORMS=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
 CONFIG_TCG_TIS_I2C_ATMEL=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 08ca231ac91275cca672f3515f737056b2df960b..453efc2565e8ee55b2a26b1b9fabeef06ee1d6ba 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7366,6 +7366,7 @@ CONFIG_PCIE_IPROC_PLATFORM=m
 CONFIG_PCIE_KIRIN=y
 # CONFIG_PCIE_LAYERSCAPE_GEN4 is not set
 CONFIG_PCIE_MEDIATEK=y
+CONFIG_PCIE_MICROSEMI=y
 # CONFIG_PCIE_MOBIVEIL_PLAT is not set
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_PTM=y
@@ -10460,6 +10461,7 @@ CONFIG_SUNXI_SRAM=y
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_SURFACE3_WMI=m
 CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_PLATFORMS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
@@ -11073,7 +11075,6 @@ CONFIG_USB_ASPEED_VHUB=m
 CONFIG_USB_ATM=m
 CONFIG_USB_AUDIO=m
 CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_BDC_PCI=m
 CONFIG_USB_BDC_UDC=m
 CONFIG_USB_BELKIN=y
 CONFIG_USB_BRCMSTB=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 2ed8e5cb4ab263b18babe1de63e332a35130794e..8d63ff100679655b7de831a2c4563c81711be90c 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -602,7 +602,6 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_SUN_PARTITION=y
-CONFIG_SURFACE_PLATFORMS=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_SYSV_FS=m
 CONFIG_TCG_TIS_I2C_ATMEL=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index c6cfa45a42709147ff9289fa3501f697622408a8..81503acb759b576e32d27940c75f7fedc45a8745 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -538,7 +538,6 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_STAGING is not set
 CONFIG_STANDALONE=y
 # CONFIG_SUN_PARTITION is not set
-# CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_TCG_TIS_I2C_ATMEL is not set