Update config for 4.18 using kconfigeditor2

- Various config symbols were removed, renamed or split - HOTPLUG_PCI_SHPC is now boolean, so set it to built-in - The stack protector config symbols were changed to two booleans with different names
2018-07-02 17:48:27 +01:00 · 2018-07-02 17:48:27 +01:00 · b20d268c2a
parent 24e6de2add
commit b20d268c2a
17 changed files with 74 additions and 179 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -5,6 +5,8 @@ linux (4.18~rc2-1~exp1) UNRELEASED; urgency=medium
  [ Ben Hutchings ]
  * aufs: Update to aufs4.x-rcN 20180702
  * netfilter: ipvs: Fix invalid bytes in IP_VS_MH_TAB_INDEX help text
+  * Update config for 4.18 using kconfigeditor2
+    - [x86,arm64] PCI: HOTPLUG_PCI_SHPC is now built-in

  [ YunQiang Su ]
  * [mips*r6*] Enable dtb building for boston.
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@ -786,12 +786,6 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m

-##
-## file: drivers/staging/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
 ##
 ## file: drivers/tty/Kconfig
 ##
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@ -62,7 +62,6 @@ CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
--- a/debian/config/amd64/config.cloud-amd64
+++ b/debian/config/amd64/config.cloud-amd64
@ -875,7 +875,7 @@ CONFIG_HYPERV_NET=m
 # CONFIG_PCI_PASID is not set

 ##
-## file: drivers/pci/host/Kconfig
+## file: drivers/pci/controller/Kconfig
 ##
 # CONFIG_VMD is not set

@ -1098,11 +1098,6 @@ CONFIG_HYPERV_STORAGE=m
 ##
 # CONFIG_STAGING is not set

-##
-## file: drivers/staging/ipx/Kconfig
-##
-# CONFIG_IPX is not set
-
 ##
 ## file: drivers/target/Kconfig
 ##
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@ -676,15 +676,7 @@ CONFIG_ROCKCHIP_EFUSE=m
 CONFIG_NVMEM_SUNXI_SID=m

 ##
-## file: drivers/pci/dwc/Kconfig
-##
-CONFIG_PCI_HISI=y
-CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ARMADA_8K=y
-CONFIG_PCIE_KIRIN=y
-
-##
-## file: drivers/pci/host/Kconfig
+## file: drivers/pci/controller/Kconfig
 ##
 CONFIG_PCI_AARDVARK=y
 CONFIG_PCI_TEGRA=y
@ -692,7 +684,15 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
-CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=y
+
+##
+## file: drivers/pci/controller/dwc/Kconfig
+##
+CONFIG_PCI_HISI=y
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_KIRIN=y

 ##
 ## file: drivers/pci/hotplug/Kconfig
@ -702,7 +702,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_HOTPLUG_PCI_SHPC=y

 ##
 ## file: drivers/phy/Kconfig
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@ -2,10 +2,7 @@
 ## file: arch/Kconfig
 ##
 # CONFIG_KPROBES is not set
-## choice: Stack Protector buffer overflow detection
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-## end choice
+# CONFIG_STACKPROTECTOR_STRONG is not set
 # CONFIG_STRICT_KERNEL_RWX is not set

 ##
@ -189,7 +186,7 @@ CONFIG_SATA_MV=m
 # CONFIG_ATA_GENERIC is not set

 ##
-## file: drivers/base/Kconfig
+## file: drivers/base/firmware_loader/Kconfig
 ##
 CONFIG_FW_LOADER=m

@ -515,22 +512,18 @@ CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m

 ##
-## file: drivers/pci/host/Kconfig
+## file: drivers/pci/controller/Kconfig
 ##
 CONFIG_PCI_MVEBU=y

 ##
 ## file: drivers/pci/pcie/Kconfig
 ##
+# CONFIG_PCIEAER is not set
 # CONFIG_PCIEASPM is not set
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set

-##
-## file: drivers/pci/pcie/aer/Kconfig
-##
-# CONFIG_PCIEAER is not set
-
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@ -147,9 +147,6 @@ CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_32K_TIMER=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 CONFIG_OMAP_SERIAL_WAKE=y
-## choice: OMAP PM layer selection
-CONFIG_OMAP_PM_NOOP=y
-## end choice

 ##
 ## file: drivers/android/Kconfig
@ -241,7 +238,6 @@ CONFIG_ARM_TEGRA_DEVFREQ=m
 CONFIG_DMADEVICES=y
 CONFIG_AMBA_PL08X=y
 CONFIG_DMA_BCM2835=y
-CONFIG_DMA_OMAP=y
 CONFIG_DMA_SUN6I=m
 CONFIG_IMX_DMA=y
 CONFIG_IMX_SDMA=y
@ -249,8 +245,13 @@ CONFIG_MV_XOR=y
 CONFIG_MXS_DMA=y
 CONFIG_PL330_DMA=y
 CONFIG_TEGRA20_APB_DMA=y
+
+##
+## file: drivers/dma/ti/Kconfig
+##
 CONFIG_TI_CPPI41=m
 CONFIG_TI_EDMA=y
+CONFIG_DMA_OMAP=y

 ##
 ## file: drivers/extcon/Kconfig
@ -881,18 +882,18 @@ CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_MESON_MX_EFUSE=m

 ##
-## file: drivers/pci/dwc/Kconfig
-##
-CONFIG_PCI_DRA7XX_HOST=y
-CONFIG_PCI_IMX6=y
-
-##
-## file: drivers/pci/host/Kconfig
+## file: drivers/pci/controller/Kconfig
 ##
 CONFIG_PCI_MVEBU=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_HOST_GENERIC=y

+##
+## file: drivers/pci/controller/dwc/Kconfig
+##
+CONFIG_PCI_DRA7XX_HOST=y
+CONFIG_PCI_IMX6=y
+
 ##
 ## file: drivers/phy/allwinner/Kconfig
 ##
--- a/debian/config/config
+++ b/debian/config/config
@ -7,9 +7,8 @@ CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
 #. Until we work out how to package them
 # CONFIG_GCC_PLUGINS is not set
-## choice: Stack Protector buffer overflow detection
-CONFIG_CC_STACKPROTECTOR_STRONG=y
-## end choice
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_VMAP_STACK=y
 CONFIG_STRICT_KERNEL_RWX=y

@ -192,7 +191,6 @@ CONFIG_ACPI_NFIT=m
 CONFIG_ANDROID_BINDER_IPC=m
 #. This configuration should support Anbox
 CONFIG_ANDROID_BINDER_DEVICES="binder"
-# CONFIG_ANDROID_BINDER_IPC_32BIT is not set
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set

 ##
@ -305,15 +303,19 @@ CONFIG_DEVTMPFS=y
 # CONFIG_DEVTMPFS_MOUNT is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_DMA_FENCE_TRACE is not set

+##
+## file: drivers/base/firmware_loader/Kconfig
+##
+CONFIG_FW_LOADER=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+
 ##
 ## file: drivers/bcma/Kconfig
 ##
@ -1015,6 +1017,8 @@ CONFIG_IIO_BUFFER=y
 ##
 ## file: drivers/iio/accel/Kconfig
 ##
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
 # CONFIG_BMA180 is not set
 # CONFIG_BMA220 is not set
 # CONFIG_BMC150_ACCEL is not set
@ -1103,7 +1107,8 @@ CONFIG_AD5446=m
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
-# CONFIG_AD5686 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
 # CONFIG_AD5755 is not set
 # CONFIG_AD5761 is not set
 # CONFIG_AD5764 is not set
@ -1207,6 +1212,7 @@ CONFIG_HID_SENSOR_PROX=m
 # CONFIG_TCS3472 is not set
 # CONFIG_SENSORS_TSL2563 is not set
 # CONFIG_TSL2583 is not set
+# CONFIG_TSL2772 is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
@ -1264,6 +1270,11 @@ CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_LIDAR_LITE_V2 is not set
 # CONFIG_SX9500 is not set

+##
+## file: drivers/iio/resolver/Kconfig
+##
+# CONFIG_AD2S1200 is not set
+
 ##
 ## file: drivers/iio/temperature/Kconfig
 ##
@ -2077,18 +2088,6 @@ CONFIG_VIDEO_TW68=m
 ##
 CONFIG_VIDEO_TW686X=m

-##
-## file: drivers/media/pci/zoran/Kconfig
-##
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-
 ##
 ## file: drivers/media/platform/Kconfig
 ##
@ -2123,7 +2122,6 @@ CONFIG_VIDEO_VIVID_MAX_DEVS=64
 ## file: drivers/media/radio/Kconfig
 ##
 CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_SI470X=y
 # CONFIG_RADIO_SI4713 is not set
 CONFIG_USB_MR800=m
 CONFIG_RADIO_SHARK=m
@ -2139,6 +2137,7 @@ CONFIG_USB_MA901=m
 ##
 ## file: drivers/media/radio/si470x/Kconfig
 ##
+CONFIG_RADIO_SI470X=y
 CONFIG_USB_SI470X=m
 # CONFIG_I2C_SI470X is not set

@ -3947,9 +3946,9 @@ CONFIG_PCI_IOV=y
 # CONFIG_PCI_PASID is not set

 ##
-## file: drivers/pci/dwc/Kconfig
+## file: drivers/pci/controller/dwc/Kconfig
 ##
-# CONFIG_PCIE_DW_PLAT is not set
+# CONFIG_PCIE_DW_PLAT_HOST is not set

 ##
 ## file: drivers/pci/hotplug/Kconfig
@ -3961,22 +3960,14 @@ CONFIG_HOTPLUG_PCI_CPCI=y
 ##
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y

-##
-## file: drivers/pci/pcie/aer/Kconfig
-##
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-
-##
-## file: drivers/pci/pcie/aer/Kconfig.debug
-##
-CONFIG_PCIEAER_INJECT=m
-
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
@ -4119,7 +4110,7 @@ CONFIG_PPS_CLIENT_PARPORT=m
 ## file: drivers/ptp/Kconfig
 ##
 CONFIG_PTP_1588_CLOCK=m
-CONFIG_PTP_1588_CLOCK_GIANFAR=m
+CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK_IXP46X=m

 ##
@ -4520,9 +4511,7 @@ CONFIG_ASHMEM=m
 ##
 ## file: drivers/staging/iio/accel/Kconfig
 ##
-# CONFIG_ADIS16201 is not set
 # CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16209 is not set
 # CONFIG_ADIS16240 is not set

 ##
@ -4562,32 +4551,17 @@ CONFIG_ASHMEM=m
 ##
 # CONFIG_AD5933 is not set

-##
-## file: drivers/staging/iio/light/Kconfig
-##
-# CONFIG_TSL2x7x is not set
-
 ##
 ## file: drivers/staging/iio/meter/Kconfig
 ##
-# CONFIG_ADE7753 is not set
-# CONFIG_ADE7754 is not set
-# CONFIG_ADE7758 is not set
-# CONFIG_ADE7759 is not set
 # CONFIG_ADE7854 is not set

 ##
 ## file: drivers/staging/iio/resolver/Kconfig
 ##
 # CONFIG_AD2S90 is not set
-# CONFIG_AD2S1200 is not set
 # CONFIG_AD2S1210 is not set

-##
-## file: drivers/staging/lustre/lustre/Kconfig
-##
-# CONFIG_LUSTRE_FS is not set
-
 ##
 ## file: drivers/staging/media/Kconfig
 ##
@ -4603,6 +4577,18 @@ CONFIG_ASHMEM=m
 ##
 # CONFIG_SOC_CAMERA_MT9T031 is not set

+##
+## file: drivers/staging/media/zoran/Kconfig
+##
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+
 ##
 ## file: drivers/staging/most/Kconfig
 ##
@ -4613,19 +4599,6 @@ CONFIG_ASHMEM=m
 ##
 # CONFIG_MTD_SPINAND_MT29F is not set

-##
-## file: drivers/staging/ncpfs/Kconfig
-##
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-# CONFIG_NCPFS_SMALLDOS is not set
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-
 ##
 ## file: drivers/staging/rtl8188eu/Kconfig
 ##
@ -5229,7 +5202,6 @@ CONFIG_FB_MB862XX_PCI_GDC=y
 ## end choice
 CONFIG_FB_MB862XX_I2C=y
 # CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set

@ -5378,7 +5350,7 @@ CONFIG_AFS_FS=m
 CONFIG_AFS_FSCACHE=y

 ##
-## file: fs/autofs4/Kconfig
+## file: fs/autofs/Kconfig
 ##
 CONFIG_AUTOFS4_FS=m

@ -5869,7 +5841,6 @@ CONFIG_XFS_RT=y
 ##
 ## file: init/Kconfig
 ##
-CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@ -6400,7 +6371,6 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 ## file: net/bridge/netfilter/Kconfig
 ##
 CONFIG_NF_TABLES_BRIDGE=y
-CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
@ -6749,9 +6719,6 @@ CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_META=m
-CONFIG_NFT_RT=m
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_SET_RBTREE=m
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@ -442,11 +442,6 @@ CONFIG_MEGARAID_MAILBOX=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m

-##
-## file: drivers/staging/ipx/Kconfig
-##
-# CONFIG_IPX is not set
-
 ##
 ## file: drivers/tty/Kconfig
 ##
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@ -52,7 +52,6 @@ CONFIG_X86_GENERIC=y
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TWOFISH_586=m

--- a/debian/config/kernelarch-mips/config.malta
+++ b/debian/config/kernelarch-mips/config.malta
@ -342,11 +342,6 @@ CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m

-##
-## file: drivers/staging/ipx/Kconfig
-##
-CONFIG_IPX=m
-
 ##
 ## file: drivers/tty/serial/Kconfig
 ##
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@ -713,12 +713,6 @@ CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m

-##
-## file: drivers/staging/ipx/Kconfig
-##
-CONFIG_IPX=m
-CONFIG_IPX_INTERN=y
-
 ##
 ## file: drivers/tty/Kconfig
 ##
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@ -228,11 +228,6 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_VIDEO_HEXIUM_ORION is not set
 # CONFIG_VIDEO_MXB is not set

-##
-## file: drivers/media/pci/zoran/Kconfig
-##
-# CONFIG_VIDEO_ZORAN is not set
-
 ##
 ## file: drivers/media/radio/Kconfig
 ##
@ -424,10 +419,9 @@ CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m

 ##
-## file: drivers/staging/ipx/Kconfig
+## file: drivers/staging/media/zoran/Kconfig
 ##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
+# CONFIG_VIDEO_ZORAN is not set

 ##
 ## file: drivers/tty/Kconfig
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@ -1303,7 +1303,7 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y

 ##
-## file: drivers/pci/host/Kconfig
+## file: drivers/pci/controller/Kconfig
 ##
 CONFIG_VMD=m

@ -1315,7 +1315,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_HOTPLUG_PCI_SHPC=y

 ##
 ## file: drivers/pcmcia/Kconfig
@ -1590,26 +1590,6 @@ CONFIG_COMEDI_VMK80XX=m
 CONFIG_COMEDI_8255_SA=m
 CONFIG_COMEDI_KCOMEDILIB=m

-##
-## file: drivers/staging/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
-##
-## file: drivers/staging/lustre/lnet/Kconfig
-##
-CONFIG_LNET=m
-CONFIG_LNET_MAX_PAYLOAD=1048576
-# CONFIG_LNET_SELFTEST is not set
-CONFIG_LNET_XPRT_IB=m
-
-##
-## file: drivers/staging/lustre/lustre/Kconfig
-##
-CONFIG_LUSTRE_FS=m
-# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-
 ##
 ## file: drivers/staging/media/Kconfig
 ##
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@ -526,11 +526,6 @@ CONFIG_BVME6000_SCSI=m
 ##
 # CONFIG_STAGING is not set

-##
-## file: drivers/staging/ipx/Kconfig
-##
-CONFIG_IPX=m
-
 ##
 ## file: drivers/tty/Kconfig
 ##
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@ -158,11 +158,6 @@ CONFIG_QETH_L3=m
 ##
 CONFIG_ZFCP=m

-##
-## file: drivers/staging/ipx/Kconfig
-##
-# CONFIG_IPX is not set
-
 ##
 ## file: drivers/tty/hvc/Kconfig
 ##
--- a/debian/config/sh4/config
+++ b/debian/config/sh4/config
@ -1,10 +1,7 @@
 ##
 ## file: arch/Kconfig
 ##
-## choice: Stack Protector buffer overflow detection
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-## end choice
+# CONFIG_STACKPROTECTOR_STRONG is not set

 ##
 ## file: arch/sh/Kconfig