Kconfig symbol cleanup for v5.4-rc1

Two Kconfig symbols were part of upstream v5.3-rc1 but didn't make it
into v5.3 (for reasons I couldn't be bothered to unearth): PREEMPT_LL
and SOUNDWIRE_BUS. Remove them from our configuration generation system
too.

Commit 3e636fe3a695 ("Remove patch for GCC VTA") forgot to clean up the
configs/ directory. Do so now.

Commit e21e52b60843 ("Linux v5.3-13236-g97f9a3c4eee5") forgot to remove
CONFIG_LOCK_DOWN_KERNEL and CONFIG_LOCK_DOWN_KERNEL_FORCE from the
configs/ directory. Do so now.

Commit 5c0d4daff4a0 ("Remove crash driver") forgot to clean up the
configs/ directory. Do so now.

There are 22 Kconfig symbols referenced in the files used for
configuration generation and in the shipped .config files that were
dropped in upstream v5.4-rc1. The references to these symbols can be
safely removed.

These symbols are:
    CONFIG_ARM_QCOM_CPUFREQ_KRYO
    CONFIG_CRYPTO_AEGIS128L
    CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2
    CONFIG_CRYPTO_AEGIS256
    CONFIG_CRYPTO_AEGIS256_AESNI_SSE2
    CONFIG_CRYPTO_AES_586
    CONFIG_CRYPTO_AES_X86_64
    CONFIG_CRYPTO_MORUS1280
    CONFIG_CRYPTO_MORUS1280_AVX2
    CONFIG_CRYPTO_MORUS1280_SSE2
    CONFIG_CRYPTO_MORUS640
    CONFIG_CRYPTO_MORUS640_SSE2
    CONFIG_DRM_TINYDRM
    CONFIG_HISI_KIRIN_DW_DSI
    CONFIG_I2C_BCM2048
    CONFIG_KEXEC_VERIFY_SIG
    CONFIG_MFD_CROS_EC_CHARDEV
    CONFIG_MTD_M25P80
    CONFIG_SENSORS_ADS1015
    CONFIG_SERIAL_8250_MOXA
    CONFIG_SGI_IOC4
    CONFIG_TINYDRM_MIPI_DBI

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

43 files changed, 0 insertions, 249 deletions

diff --git a/configs/fedora/generic/CONFIG_CRASH b/configs/fedora/generic/CONFIG_CRASH
deleted file mode 100644
index 98a38fe93..000000000
--- a/configs/fedora/generic/CONFIG_CRASH
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRASH=m
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L
deleted file mode 100644
index 332f8d41c..000000000
--- a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS128L
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AEGIS128L=m
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256 b/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256
deleted file mode 100644
index 505f92cb2..000000000
--- a/configs/fedora/generic/CONFIG_CRYPTO_AEGIS256
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AEGIS256=m
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280 b/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280
deleted file mode 100644
index 631ee59ba..000000000
--- a/configs/fedora/generic/CONFIG_CRYPTO_MORUS1280
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_MORUS1280=m
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_MORUS640 b/configs/fedora/generic/CONFIG_CRYPTO_MORUS640
deleted file mode 100644
index 774f20fc6..000000000
--- a/configs/fedora/generic/CONFIG_CRYPTO_MORUS640
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_MORUS640=m
diff --git a/configs/fedora/generic/CONFIG_DEBUG_INFO_VTA b/configs/fedora/generic/CONFIG_DEBUG_INFO_VTA
deleted file mode 100644
index 593de8069..000000000
--- a/configs/fedora/generic/CONFIG_DEBUG_INFO_VTA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEBUG_INFO_VTA=y
diff --git a/configs/fedora/generic/CONFIG_DRM_TINYDRM b/configs/fedora/generic/CONFIG_DRM_TINYDRM
deleted file mode 100644
index be104b06c..000000000
--- a/configs/fedora/generic/CONFIG_DRM_TINYDRM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_TINYDRM is not set
diff --git a/configs/fedora/generic/CONFIG_I2C_BCM2048 b/configs/fedora/generic/CONFIG_I2C_BCM2048
deleted file mode 100644
index 65ce228bc..000000000
--- a/configs/fedora/generic/CONFIG_I2C_BCM2048
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_BCM2048 is not set
diff --git a/configs/fedora/generic/CONFIG_LOCK_DOWN_KERNEL b/configs/fedora/generic/CONFIG_LOCK_DOWN_KERNEL
deleted file mode 100644
index c22c35ff2..000000000
--- a/configs/fedora/generic/CONFIG_LOCK_DOWN_KERNEL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LOCK_DOWN_KERNEL is not set
diff --git a/configs/fedora/generic/CONFIG_PREEMPT_LL b/configs/fedora/generic/CONFIG_PREEMPT_LL
deleted file mode 100644
index 513294a39..000000000
--- a/configs/fedora/generic/CONFIG_PREEMPT_LL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PREEMPT_LL is not set
diff --git a/configs/fedora/generic/CONFIG_SENSORS_ADS1015 b/configs/fedora/generic/CONFIG_SENSORS_ADS1015
deleted file mode 100644
index 928b4f25f..000000000
--- a/configs/fedora/generic/CONFIG_SENSORS_ADS1015
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SENSORS_ADS1015 is not set
diff --git a/configs/fedora/generic/CONFIG_SGI_IOC4 b/configs/fedora/generic/CONFIG_SGI_IOC4
deleted file mode 100644
index 0d104aafd..000000000
--- a/configs/fedora/generic/CONFIG_SGI_IOC4
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SGI_IOC4 is not set
diff --git a/configs/fedora/generic/CONFIG_SOUNDWIRE_BUS b/configs/fedora/generic/CONFIG_SOUNDWIRE_BUS
deleted file mode 100644
index dd3714b7c..000000000
--- a/configs/fedora/generic/CONFIG_SOUNDWIRE_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SOUNDWIRE_BUS=m
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_QCOM_CPUFREQ_KRYO b/configs/fedora/generic/arm/CONFIG_ARM_QCOM_CPUFREQ_KRYO
deleted file mode 100644
index 3b9e5e47f..000000000
--- a/configs/fedora/generic/arm/CONFIG_ARM_QCOM_CPUFREQ_KRYO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
diff --git a/configs/fedora/generic/arm/CONFIG_DRM_TINYDRM b/configs/fedora/generic/arm/CONFIG_DRM_TINYDRM
deleted file mode 100644
index 4e6e01bfe..000000000
--- a/configs/fedora/generic/arm/CONFIG_DRM_TINYDRM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_TINYDRM=m
diff --git a/configs/fedora/generic/arm/CONFIG_TINYDRM_MIPI_DBI b/configs/fedora/generic/arm/CONFIG_TINYDRM_MIPI_DBI
deleted file mode 100644
index bb0235842..000000000
--- a/configs/fedora/generic/arm/CONFIG_TINYDRM_MIPI_DBI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TINYDRM_MIPI_DBI=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_HISI_KIRIN_DW_DSI b/configs/fedora/generic/arm/aarch64/CONFIG_HISI_KIRIN_DW_DSI
deleted file mode 100644
index cef60968e..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_HISI_KIRIN_DW_DSI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HISI_KIRIN_DW_DSI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_M25P80 b/configs/fedora/generic/arm/armv7/CONFIG_MTD_M25P80
deleted file mode 100644
index 9e4ab3f0b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_M25P80
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MTD_M25P80=m
diff --git a/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG b/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG
deleted file mode 100644
index 5d9b84372..000000000
--- a/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEXEC_VERIFY_SIG is not set
diff --git a/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL b/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL
deleted file mode 100644
index e99bff22d..000000000
--- a/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOCK_DOWN_KERNEL=y
diff --git a/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL_FORCE b/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL_FORCE
deleted file mode 100644
index b6a333ecd..000000000
--- a/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL_FORCE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
diff --git a/configs/fedora/generic/x86/i686/CONFIG_CRYPTO_AES_586 b/configs/fedora/generic/x86/i686/CONFIG_CRYPTO_AES_586
deleted file mode 100644
index 4702bf09c..000000000
--- a/configs/fedora/generic/x86/i686/CONFIG_CRYPTO_AES_586
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AES_586=y
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2
deleted file mode 100644
index 21a9942c6..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE2
deleted file mode 100644
index 847524120..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AEGIS256_AESNI_SSE2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AES_X86_64 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AES_X86_64
deleted file mode 100644
index 7c09d010b..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_AES_X86_64
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_AES_X86_64=y
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2
deleted file mode 100644
index 8ae1a8885..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_AVX2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_MORUS1280_AVX2=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2
deleted file mode 100644
index 786389934..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS1280_SSE2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_MORUS1280_SSE2=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2 b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2
deleted file mode 100644
index 07d98b3fd..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_MORUS640_SSE2
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CRYPTO_MORUS640_SSE2=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_SGI_IOC4 b/configs/fedora/generic/x86/x86_64/CONFIG_SGI_IOC4
deleted file mode 100644
index 89b268e91..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_SGI_IOC4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SGI_IOC4=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 0c8630555..b61778531 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -360,7 +360,6 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
@@ -1068,7 +1067,6 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -1100,10 +1098,8 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_ARM64_BS=m
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
@@ -1210,8 +1206,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
@@ -1298,7 +1292,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1578,7 +1571,6 @@ CONFIG_DRM_SUN8I_MIXER=m
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-CONFIG_DRM_TINYDRM=m
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2219,7 +2211,6 @@ CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
-CONFIG_HISI_KIRIN_DW_DSI=m
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_HISILICON_ERRATUM_161600802=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
@@ -2298,7 +2289,6 @@ CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
-# CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CADENCE=m
@@ -3124,7 +3114,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 CONFIG_LOCK_EVENT_COUNTS=y
 # CONFIG_LOCK_STAT is not set
@@ -4686,7 +4675,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5405,7 +5393,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5656,7 +5643,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -6105,7 +6091,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSE_IRQ=y
@@ -6435,7 +6420,6 @@ CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_MIPI_DBI=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2f9cab3b1..8116137c1 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -360,7 +360,6 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
@@ -1068,7 +1067,6 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -1100,10 +1098,8 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_ARM64_BS=m
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
@@ -1210,8 +1206,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
@@ -1298,7 +1292,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1570,7 +1563,6 @@ CONFIG_DRM_SUN8I_MIXER=m
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-CONFIG_DRM_TINYDRM=m
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2203,7 +2195,6 @@ CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
-CONFIG_HISI_KIRIN_DW_DSI=m
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_HISILICON_ERRATUM_161600802=y
 CONFIG_HISILICON_IRQ_MBIGEN=y
@@ -2282,7 +2273,6 @@ CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
-# CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CADENCE=m
@@ -3106,7 +3096,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 # CONFIG_LOCK_STAT is not set
@@ -4666,7 +4655,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5384,7 +5372,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5635,7 +5622,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -6083,7 +6069,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSE_IRQ=y
@@ -6413,7 +6398,6 @@ CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_MIPI_DBI=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 5fe089172..2ad58e8e6 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -353,7 +353,6 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -1064,7 +1063,6 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -1095,10 +1093,8 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_ARM_BS=y
 # CONFIG_CRYPTO_AES_ARM_CE is not set
 CONFIG_CRYPTO_AES_ARM=y
@@ -1203,8 +1199,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
@@ -1289,7 +1283,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1606,7 +1599,6 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TILCDC=m
-CONFIG_DRM_TINYDRM=m
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2319,7 +2311,6 @@ CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
-# CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CADENCE=m
@@ -3159,7 +3150,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 CONFIG_LOCK_EVENT_COUNTS=y
 # CONFIG_LOCK_STAT is not set
@@ -3701,7 +3691,6 @@ CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
 # CONFIG_MTD_LPDDR2_NVM is not set
 # CONFIG_MTD_LPDDR is not set
 CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -4788,7 +4777,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5537,7 +5525,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5802,7 +5789,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -6316,7 +6302,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -6682,7 +6667,6 @@ CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_MIPI_DBI=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 223238f14..6ccfaa4ac 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -343,7 +343,6 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -1031,7 +1030,6 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -1062,10 +1060,8 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_ARM_BS=y
 # CONFIG_CRYPTO_AES_ARM_CE is not set
 CONFIG_CRYPTO_AES_ARM=y
@@ -1165,8 +1161,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
@@ -1249,7 +1243,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1547,7 +1540,6 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TILCDC is not set
-CONFIG_DRM_TINYDRM=m
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2243,7 +2235,6 @@ CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
-# CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CADENCE=m
@@ -3063,7 +3054,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 CONFIG_LOCK_EVENT_COUNTS=y
 # CONFIG_LOCK_STAT is not set
@@ -3577,7 +3567,6 @@ CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
 # CONFIG_MTD_LPDDR2_NVM is not set
 # CONFIG_MTD_LPDDR is not set
 CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -4605,7 +4594,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5295,7 +5283,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5546,7 +5533,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -6008,7 +5994,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -6354,7 +6339,6 @@ CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_MIPI_DBI=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8c0a47ce9..ddf3eb2c0 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -343,7 +343,6 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -1031,7 +1030,6 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -1062,10 +1060,8 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_ARM_BS=y
 # CONFIG_CRYPTO_AES_ARM_CE is not set
 CONFIG_CRYPTO_AES_ARM=y
@@ -1165,8 +1161,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
@@ -1249,7 +1243,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1540,7 +1533,6 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TILCDC is not set
-CONFIG_DRM_TINYDRM=m
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2228,7 +2220,6 @@ CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
-# CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CADENCE=m
@@ -3046,7 +3037,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 # CONFIG_LOCK_STAT is not set
@@ -3558,7 +3548,6 @@ CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
 # CONFIG_MTD_LPDDR2_NVM is not set
 # CONFIG_MTD_LPDDR is not set
 CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -4586,7 +4575,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5275,7 +5263,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5526,7 +5513,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -5987,7 +5973,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -6333,7 +6318,6 @@ CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_MIPI_DBI=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 8df753f0b..1ff57d584 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -353,7 +353,6 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
-CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -1064,7 +1063,6 @@ CONFIG_CPU_THERMAL=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -1095,10 +1093,8 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_ARM_BS=y
 # CONFIG_CRYPTO_AES_ARM_CE is not set
 CONFIG_CRYPTO_AES_ARM=y
@@ -1203,8 +1199,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
@@ -1289,7 +1283,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1599,7 +1592,6 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 CONFIG_DRM_TILCDC=m
-CONFIG_DRM_TINYDRM=m
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2304,7 +2296,6 @@ CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
-# CONFIG_I2C_BCM2048 is not set
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CADENCE=m
@@ -3142,7 +3133,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 # CONFIG_LOCK_STAT is not set
@@ -3682,7 +3672,6 @@ CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
 # CONFIG_MTD_LPDDR2_NVM is not set
 # CONFIG_MTD_LPDDR is not set
 CONFIG_MTD=m
-CONFIG_MTD_M25P80=m
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -4769,7 +4758,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -5517,7 +5505,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5782,7 +5769,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -6295,7 +6281,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -6661,7 +6646,6 @@ CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
-CONFIG_TINYDRM_MIPI_DBI=m
 CONFIG_TINYDRM_REPAPER=m
 CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 0d9448b88..362e75bc2 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -864,7 +864,6 @@ CONFIG_CPUSETS=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -890,10 +889,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_AES_586=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES=y
@@ -976,8 +972,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
 CONFIG_CRYPTO_NULL=y
@@ -1057,7 +1051,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1319,7 +1312,6 @@ CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2045,7 +2037,6 @@ CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
@@ -2866,9 +2857,7 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
-# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOCKD_V4=y
 CONFIG_LOCK_EVENT_COUNTS=y
 CONFIG_LOCK_STAT=y
@@ -4291,7 +4280,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -4883,7 +4871,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5121,7 +5108,6 @@ CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFI=y
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -5562,7 +5548,6 @@ CONFIG_SONYPI_COMPAT=y
 CONFIG_SONYPI=m
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
 CONFIG_SOUNDWIRE=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 1e3916c40..5727c1f08 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -863,7 +863,6 @@ CONFIG_CPUSETS=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -889,10 +888,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_AES_586=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES=y
@@ -975,8 +971,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
 CONFIG_CRYPTO_NULL=y
@@ -1056,7 +1050,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1310,7 +1303,6 @@ CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2028,7 +2020,6 @@ CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
@@ -2847,9 +2838,7 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
-# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 # CONFIG_LOCK_STAT is not set
@@ -4272,7 +4261,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -4863,7 +4851,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5101,7 +5088,6 @@ CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFI=y
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -5541,7 +5527,6 @@ CONFIG_SONYPI_COMPAT=y
 CONFIG_SONYPI=m
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
 CONFIG_SOUNDWIRE=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index c85d5b83a..8e8bd0d4b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -803,7 +803,6 @@ CONFIG_CPUSETS=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -828,9 +827,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -906,8 +903,6 @@ CONFIG_CRYPTO_MD4=m
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
@@ -984,7 +979,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1216,7 +1210,6 @@ CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -1862,7 +1855,6 @@ CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
@@ -2621,7 +2613,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 CONFIG_LOCK_EVENT_COUNTS=y
 CONFIG_LOCK_STAT=y
@@ -3999,7 +3990,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -4579,7 +4569,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -4806,7 +4795,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -5187,7 +5175,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPAPR_TCE_IOMMU=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 52cd43193..35a268c31 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -802,7 +802,6 @@ CONFIG_CPUSETS=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -827,9 +826,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
@@ -905,8 +902,6 @@ CONFIG_CRYPTO_MD4=m
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
@@ -983,7 +978,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1207,7 +1201,6 @@ CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -1845,7 +1838,6 @@ CONFIG_I2C_ALGOPCF=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
@@ -2602,7 +2594,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 # CONFIG_LOCK_STAT is not set
@@ -3978,7 +3969,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -4557,7 +4547,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -4784,7 +4773,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -5164,7 +5152,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPAPR_TCE_IOMMU=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index c325d31ba..30d8803d0 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -809,7 +809,6 @@ CONFIG_CPUSETS=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -834,9 +833,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES=y
@@ -907,8 +904,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PAES_S390=m
@@ -994,7 +989,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1224,7 +1218,6 @@ CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -1846,7 +1839,6 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_CHARDEV is not set
@@ -2411,7 +2403,6 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC_FILE=y
 CONFIG_KEXEC_SIG=y
-# CONFIG_KEXEC_VERIFY_SIG is not set
 CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ADC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
@@ -2598,7 +2589,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 CONFIG_LOCK_EVENT_COUNTS=y
 CONFIG_LOCK_STAT=y
@@ -3933,7 +3923,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -4526,7 +4515,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -4749,7 +4737,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -5130,7 +5117,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 # CONFIG_SOUND is not set
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 3ff05de88..263ad26a4 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -808,7 +808,6 @@ CONFIG_CPUSETS=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -833,9 +832,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES=y
@@ -906,8 +903,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS640=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PAES_S390=m
@@ -993,7 +988,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1215,7 +1209,6 @@ CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -1829,7 +1822,6 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_AMD8111 is not set
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_CHARDEV is not set
@@ -2392,7 +2384,6 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC_FILE=y
 CONFIG_KEXEC_SIG=y
-# CONFIG_KEXEC_VERIFY_SIG is not set
 CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ADC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
@@ -2579,7 +2570,6 @@ CONFIG_LOCKD=m
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL is not set
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 # CONFIG_LOCK_STAT is not set
@@ -3912,7 +3902,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -4504,7 +4493,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -4727,7 +4715,6 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFP=m
-# CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
 # CONFIG_SI1133 is not set
@@ -5107,7 +5094,6 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 # CONFIG_SOUND is not set
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 7c7573e09..7564168dd 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -878,7 +878,6 @@ CONFIG_CPUSETS=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -908,14 +907,9 @@ CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_AES_TI=m
-CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
@@ -1006,11 +1000,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280_AVX2=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS1280_SSE2=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS640_SSE2=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
 CONFIG_CRYPTO_NULL=y
@@ -1097,7 +1086,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1362,7 +1350,6 @@ CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2081,7 +2068,6 @@ CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
@@ -2923,9 +2909,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
-# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOCKD_V4=y
 CONFIG_LOCK_EVENT_COUNTS=y
 CONFIG_LOCK_STAT=y
@@ -4335,7 +4319,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -4932,7 +4915,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5175,7 +5157,6 @@ CONFIG_SFI=y
 CONFIG_SFP=m
 # CONFIG_SGI_GRU_DEBUG is not set
 CONFIG_SGI_GRU=m
-CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SGI_XP=m
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
@@ -5618,7 +5599,6 @@ CONFIG_SONYPI_COMPAT=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
 CONFIG_SOUNDWIRE=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 17386faef..e02314c85 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -877,7 +877,6 @@ CONFIG_CPUSETS=y
 CONFIG_CRAMFS=m
 # CONFIG_CRAMFS_MTD is not set
 CONFIG_CRASH_DUMP=y
-CONFIG_CRASH=m
 CONFIG_CRC16=y
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC32_SARWATE is not set
@@ -907,14 +906,9 @@ CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_ADIANTUM=m
 CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS128L=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m
-CONFIG_CRYPTO_AEGIS256=m
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_AES_TI=m
-CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
@@ -1005,11 +999,6 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_MORUS1280_AVX2=m
-CONFIG_CRYPTO_MORUS1280=m
-CONFIG_CRYPTO_MORUS1280_SSE2=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS640_SSE2=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
 CONFIG_CRYPTO_NULL=y
@@ -1096,7 +1085,6 @@ CONFIG_DEBUG_HIGHMEM=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-CONFIG_DEBUG_INFO_VTA=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 CONFIG_DEBUG_KERNEL=y
@@ -1353,7 +1341,6 @@ CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
 # CONFIG_DRM_TDFX=n is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
 CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358764=m
@@ -2064,7 +2051,6 @@ CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_AMD_MP2=m
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_BCM2048 is not set
 # CONFIG_I2C_CADENCE is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 CONFIG_I2C_CHARDEV=m
@@ -2904,9 +2890,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
 # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
-# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
 CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-CONFIG_LOCK_DOWN_KERNEL=y
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 # CONFIG_LOCK_STAT is not set
@@ -4316,7 +4300,6 @@ CONFIG_PPTP=m
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_LL is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
@@ -4912,7 +4895,6 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_ADM9240=m
-# CONFIG_SENSORS_ADS1015 is not set
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7310=m
@@ -5155,7 +5137,6 @@ CONFIG_SFI=y
 CONFIG_SFP=m
 # CONFIG_SGI_GRU_DEBUG is not set
 CONFIG_SGI_GRU=m
-CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SGI_XP=m
 CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
@@ -5597,7 +5578,6 @@ CONFIG_SONYPI_COMPAT=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_BUS=m
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
 CONFIG_SOUNDWIRE=y