cleanup some deprecated options, minor arm config tweaks

35 files changed, 45 insertions, 149 deletions

diff --git a/baseconfig/CONFIG_BLK_DEV_UB b/baseconfig/CONFIG_BLK_DEV_UB
deleted file mode 100644
index 6fbfd13fb..000000000
--- a/baseconfig/CONFIG_BLK_DEV_UB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_UB is not set
diff --git a/baseconfig/CONFIG_BT_SCO b/baseconfig/CONFIG_BT_SCO
deleted file mode 100644
index c04760986..000000000
--- a/baseconfig/CONFIG_BT_SCO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BT_SCO=y
diff --git a/baseconfig/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/CONFIG_CHARGER_QCOM_SMBB
deleted file mode 100644
index c06d8f1f1..000000000
--- a/baseconfig/CONFIG_CHARGER_QCOM_SMBB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CHARGER_QCOM_SMBB is not set
diff --git a/baseconfig/CONFIG_DP83867_PHY b/baseconfig/CONFIG_DP83867_PHY
index 5ba3d57bd..2bb3289c3 100644
--- a/baseconfig/CONFIG_DP83867_PHY
+++ b/baseconfig/CONFIG_DP83867_PHY
@@ -1 +1 @@
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
diff --git a/baseconfig/CONFIG_EXPERIMENTAL b/baseconfig/CONFIG_EXPERIMENTAL
deleted file mode 100644
index 8c91d40b9..000000000
--- a/baseconfig/CONFIG_EXPERIMENTAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXPERIMENTAL=y
diff --git a/baseconfig/CONFIG_INOTIFY b/baseconfig/CONFIG_INOTIFY
deleted file mode 100644
index 78343a1d2..000000000
--- a/baseconfig/CONFIG_INOTIFY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INOTIFY=y
diff --git a/baseconfig/CONFIG_USB_LED b/baseconfig/CONFIG_USB_LED
deleted file mode 100644
index 445af6c46..000000000
--- a/baseconfig/CONFIG_USB_LED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_LED=m
diff --git a/baseconfig/arm/arm64/CONFIG_ARCH_BCM_IPROC b/baseconfig/arm/CONFIG_ARCH_BCM_IPROC
index d60fe565f..d60fe565f 100644
--- a/baseconfig/arm/arm64/CONFIG_ARCH_BCM_IPROC
+++ b/baseconfig/arm/CONFIG_ARCH_BCM_IPROC
diff --git a/baseconfig/arm/CONFIG_IOMMU_DMA b/baseconfig/arm/CONFIG_IOMMU_DMA
new file mode 100644
index 000000000..a9155fba1
--- /dev/null
+++ b/baseconfig/arm/CONFIG_IOMMU_DMA
@@ -0,0 +1 @@
+CONFIG_IOMMU_DMA=y
diff --git a/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB
new file mode 100644
index 000000000..43a91eb0e
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_CHARGER_QCOM_SMBB
@@ -0,0 +1 @@
+CONFIG_CHARGER_QCOM_SMBB=m
diff --git a/baseconfig/arm/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC
index 6360fee39..6360fee39 100644
--- a/baseconfig/arm/CONFIG_MFD_SPMI_PMIC
+++ b/baseconfig/arm/arm64/CONFIG_MFD_SPMI_PMIC
diff --git a/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS b/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS
new file mode 100644
index 000000000..5e2512c4c
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_VIDEO_QCOM_CAMSS
@@ -0,0 +1 @@
+CONFIG_VIDEO_QCOM_CAMSS=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
new file mode 100644
index 000000000..43a91eb0e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_CHARGER_QCOM_SMBB
@@ -0,0 +1 @@
+CONFIG_CHARGER_QCOM_SMBB=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC b/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
new file mode 100644
index 000000000..6360fee39
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MFD_SPMI_PMIC
@@ -0,0 +1 @@
+CONFIG_MFD_SPMI_PMIC=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
new file mode 100644
index 000000000..5e2512c4c
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_VIDEO_QCOM_CAMSS
@@ -0,0 +1 @@
+CONFIG_VIDEO_QCOM_CAMSS=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 2dee2256b..db89fd2dd 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -559,7 +559,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -686,7 +685,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BTT=y
 CONFIG_BT_WILINK=m
@@ -818,7 +816,7 @@ CONFIG_CHARGER_AXP20X=m
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
+CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1246,7 +1244,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1509,7 +1507,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2209,7 +2206,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -2283,6 +2279,7 @@ CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
+CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
@@ -6017,7 +6014,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
@@ -6319,6 +6315,7 @@ CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 05c85d05c..92ca930a2 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -559,7 +559,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -686,7 +685,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BTT=y
 CONFIG_BT_WILINK=m
@@ -818,7 +816,7 @@ CONFIG_CHARGER_AXP20X=m
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
+CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1236,7 +1234,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1499,7 +1497,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2192,7 +2189,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -2266,6 +2262,7 @@ CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
+CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
@@ -5994,7 +5991,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
@@ -6296,6 +6292,7 @@ CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 309d67aa8..4f07e53e7 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -194,6 +194,7 @@ CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_BCM_53573 is not set
 # CONFIG_ARCH_BCM_63XX is not set
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM=y
 # CONFIG_ARCH_BERLIN is not set
@@ -600,7 +601,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -727,7 +727,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -860,7 +859,7 @@ CONFIG_CHARGER_MANAGER=y
 # CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_MAX8997=m
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
+CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1310,7 +1309,7 @@ CONFIG_DONGLE=y
 CONFIG_DOVE_THERMAL=m
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1622,7 +1621,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2354,7 +2352,6 @@ CONFIG_INET=y
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 CONFIG_INPUT_88PM80X_ONKEY=m
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
@@ -2438,6 +2435,7 @@ CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
+CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
@@ -6536,7 +6534,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
@@ -6864,6 +6861,7 @@ CONFIG_VIDEO_OMAP3=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index f0d4356d0..bb0c4f2c9 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -190,6 +190,7 @@ CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_BCM_53573 is not set
 # CONFIG_ARCH_BCM_63XX is not set
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM=y
 # CONFIG_ARCH_BERLIN is not set
@@ -576,7 +577,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -702,7 +702,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -835,7 +834,6 @@ CONFIG_CHARGER_MANAGER=y
 # CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_MAX8997=m
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1256,7 +1254,7 @@ CONFIG_DONGLE=y
 CONFIG_DOVE_THERMAL=m
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1533,7 +1531,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2232,7 +2229,6 @@ CONFIG_INET=y
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -2308,6 +2304,7 @@ CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
+CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
@@ -3084,7 +3081,6 @@ CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SYSCON=y
@@ -6112,7 +6108,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 02074d46f..6fc6fa22b 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -190,6 +190,7 @@ CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_BCM_53573 is not set
 # CONFIG_ARCH_BCM_63XX is not set
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM=y
 # CONFIG_ARCH_BERLIN is not set
@@ -575,7 +576,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -701,7 +701,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -834,7 +833,6 @@ CONFIG_CHARGER_MANAGER=y
 # CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_MAX8997=m
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1246,7 +1244,7 @@ CONFIG_DONGLE=y
 CONFIG_DOVE_THERMAL=m
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1523,7 +1521,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2215,7 +2212,6 @@ CONFIG_INET=y
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -2291,6 +2287,7 @@ CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
+CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
@@ -3064,7 +3061,6 @@ CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUN4I_GPADC=m
 CONFIG_MFD_SYSCON=y
@@ -6089,7 +6085,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 04230bd71..b2671c8f5 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -194,6 +194,7 @@ CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_BCM_53573 is not set
 # CONFIG_ARCH_BCM_63XX is not set
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM=y
 # CONFIG_ARCH_BERLIN is not set
@@ -599,7 +600,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -726,7 +726,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -859,7 +858,7 @@ CONFIG_CHARGER_MANAGER=y
 # CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_MAX8997=m
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
+CONFIG_CHARGER_QCOM_SMBB=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1300,7 +1299,7 @@ CONFIG_DONGLE=y
 CONFIG_DOVE_THERMAL=m
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1612,7 +1611,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2337,7 +2335,6 @@ CONFIG_INET=y
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 CONFIG_INPUT_88PM80X_ONKEY=m
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
@@ -2421,6 +2418,7 @@ CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
+CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
@@ -6513,7 +6511,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
@@ -6841,6 +6838,7 @@ CONFIG_VIDEO_OMAP3=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 1a7a0db00..236f86527 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -470,7 +470,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -594,7 +593,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -715,7 +713,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1096,7 +1093,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DPTF_POWER=m
@@ -1366,7 +1363,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2076,7 +2072,6 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5637,7 +5632,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 85b1679b0..8ae3ea67c 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -471,7 +471,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -595,7 +594,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -716,7 +714,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1107,7 +1104,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DPTF_POWER=m
@@ -1377,7 +1374,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2094,7 +2090,6 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5659,7 +5654,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index c2fc1f7e2..e531214dc 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -471,7 +471,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -595,7 +594,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -716,7 +714,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1107,7 +1104,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DPTF_POWER=m
@@ -1377,7 +1374,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2094,7 +2090,6 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5659,7 +5654,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 579e0696f..998e41462 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -470,7 +470,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -594,7 +593,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -715,7 +713,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1096,7 +1093,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DPTF_POWER=m
@@ -1366,7 +1363,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2076,7 +2072,6 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5637,7 +5632,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 1da154ee7..dfbb87650 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -455,7 +455,6 @@ CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_VIA82CXXX is not set
 CONFIG_BLK_DEV=y
@@ -581,7 +580,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -702,7 +700,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1077,7 +1074,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1298,7 +1295,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1989,7 +1985,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5437,7 +5432,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index cacb21165..0f7cf5296 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -454,7 +454,6 @@ CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_VIA82CXXX is not set
 CONFIG_BLK_DEV=y
@@ -580,7 +579,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -701,7 +699,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1066,7 +1063,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1287,7 +1284,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1971,7 +1967,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5413,7 +5408,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2294fec5b..65be21b1c 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -412,7 +412,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -537,7 +536,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -658,7 +656,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1032,7 +1029,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1251,7 +1248,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1934,7 +1930,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5365,7 +5360,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index ebd643140..5df5817ae 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -411,7 +411,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -536,7 +535,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -657,7 +655,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1021,7 +1018,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1240,7 +1237,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1916,7 +1912,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5341,7 +5336,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index fb2df73e7..6d0f0debb 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -412,7 +412,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -537,7 +536,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -658,7 +656,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1031,7 +1028,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1250,7 +1247,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1933,7 +1929,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5364,7 +5359,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 1cca4702c..6aa361fbc 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -411,7 +411,6 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -536,7 +535,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -657,7 +655,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1020,7 +1017,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1239,7 +1236,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1915,7 +1911,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5340,7 +5335,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 812d974f8..b2784f833 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -412,7 +412,6 @@ CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV_XPRAM=m
 CONFIG_BLK_DEV=y
@@ -537,7 +536,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -658,7 +656,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_CHARGER_SMB347 is not set
@@ -1031,7 +1028,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 # CONFIG_DP83640_PHY is not set
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1248,7 +1245,6 @@ CONFIG_ETHERNET=y
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1886,7 +1882,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5261,7 +5256,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 89db07c06..71ad0cd51 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -411,7 +411,6 @@ CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV_XPRAM=m
 CONFIG_BLK_DEV=y
@@ -536,7 +535,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BT_WILINK=m
@@ -657,7 +655,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_CHARGER_SMB347 is not set
@@ -1020,7 +1017,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 # CONFIG_DP83640_PHY is not set
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1237,7 +1234,6 @@ CONFIG_ETHERNET=y
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -1868,7 +1864,6 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5237,7 +5232,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 34fe8e0b6..93bba8f83 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -483,7 +483,6 @@ CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -607,7 +606,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BTT=y
 CONFIG_BT_WILINK=m
@@ -729,7 +727,6 @@ CONFIG_CHARGER_BQ24190=m
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1152,7 +1149,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DPTF_POWER=m
@@ -1422,7 +1419,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2141,7 +2137,6 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5710,7 +5705,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index ffc9196ed..c94975f12 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -482,7 +482,6 @@ CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
@@ -606,7 +605,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-CONFIG_BT_SCO=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BTT=y
 CONFIG_BT_WILINK=m
@@ -728,7 +726,6 @@ CONFIG_CHARGER_BQ24190=m
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_SBS is not set
 CONFIG_CHARGER_SMB347=m
@@ -1141,7 +1138,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DONGLE=y
 CONFIG_DP83640_PHY=m
 CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
+# CONFIG_DP83867_PHY is not set
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_DPOT_DAC=m
 CONFIG_DPTF_POWER=m
@@ -1411,7 +1408,6 @@ CONFIG_ETHOC=m
 # CONFIG_EVM is not set
 # CONFIG_EXOFS_DEBUG is not set
 # CONFIG_EXOFS_FS is not set
-CONFIG_EXPERIMENTAL=y
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
@@ -2123,7 +2119,6 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY_USER=y
-CONFIG_INOTIFY=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
 CONFIG_INPUT_APANEL=m
@@ -5688,7 +5683,6 @@ CONFIG_USB_KEENE=m
 CONFIG_USB_LAN78XX=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
-CONFIG_USB_LED=m
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_LEGOTOWER=m