minor merge window cleanups

39 files changed, 15 insertions, 82 deletions

diff --git a/baseconfig/CONFIG_CRYPTO_DEV_CAVIUM_ZIP b/baseconfig/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
deleted file mode 100644
index e6d3a0d6e..000000000
--- a/baseconfig/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
diff --git a/baseconfig/CONFIG_EDAC_MM_EDAC b/baseconfig/CONFIG_EDAC_MM_EDAC
deleted file mode 100644
index 5f7fa223a..000000000
--- a/baseconfig/CONFIG_EDAC_MM_EDAC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EDAC_MM_EDAC=m
diff --git a/baseconfig/CONFIG_LIRC_SASEM b/baseconfig/CONFIG_LIRC_SASEM
deleted file mode 100644
index 4bfc392e8..000000000
--- a/baseconfig/CONFIG_LIRC_SASEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LIRC_SASEM=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI b/baseconfig/arm/CONFIG_DRM_DW_HDMI
index 0be71f10f..0be71f10f 100644
--- a/baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI
+++ b/baseconfig/arm/CONFIG_DRM_DW_HDMI
diff --git a/baseconfig/arm/arm64/CONFIG_SOC_TEGRA_FLOWCTRL b/baseconfig/arm/arm64/CONFIG_SOC_TEGRA_FLOWCTRL
new file mode 100644
index 000000000..00413d459
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SOC_TEGRA_FLOWCTRL
@@ -0,0 +1 @@
+CONFIG_SOC_TEGRA_FLOWCTRL=y
diff --git a/baseconfig/arm/armv7/CONFIG_HW_RANDOM_EXYNOS b/baseconfig/arm/armv7/CONFIG_HW_RANDOM_EXYNOS
deleted file mode 100644
index 87c25300c..000000000
--- a/baseconfig/arm/armv7/CONFIG_HW_RANDOM_EXYNOS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_EXYNOS=m
diff --git a/baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL b/baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL
new file mode 100644
index 000000000..00413d459
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL
@@ -0,0 +1 @@
+CONFIG_SOC_TEGRA_FLOWCTRL=y
diff --git a/baseconfig/x86/CONFIG_EDAC_AMD76X b/baseconfig/x86/i686/CONFIG_EDAC_AMD76X
index fe5952e70..fe5952e70 100644
--- a/baseconfig/x86/CONFIG_EDAC_AMD76X
+++ b/baseconfig/x86/i686/CONFIG_EDAC_AMD76X
diff --git a/baseconfig/x86/CONFIG_EDAC_E7XXX b/baseconfig/x86/i686/CONFIG_EDAC_E7XXX
index 0322ddb69..0322ddb69 100644
--- a/baseconfig/x86/CONFIG_EDAC_E7XXX
+++ b/baseconfig/x86/i686/CONFIG_EDAC_E7XXX
diff --git a/baseconfig/x86/CONFIG_EDAC_I82860 b/baseconfig/x86/i686/CONFIG_EDAC_I82860
index 5e132db1a..5e132db1a 100644
--- a/baseconfig/x86/CONFIG_EDAC_I82860
+++ b/baseconfig/x86/i686/CONFIG_EDAC_I82860
diff --git a/baseconfig/x86/CONFIG_EDAC_I82875P b/baseconfig/x86/i686/CONFIG_EDAC_I82875P
index dbe32d406..dbe32d406 100644
--- a/baseconfig/x86/CONFIG_EDAC_I82875P
+++ b/baseconfig/x86/i686/CONFIG_EDAC_I82875P
diff --git a/baseconfig/x86/CONFIG_EDAC_R82600 b/baseconfig/x86/i686/CONFIG_EDAC_R82600
index 93a01e506..93a01e506 100644
--- a/baseconfig/x86/CONFIG_EDAC_R82600
+++ b/baseconfig/x86/i686/CONFIG_EDAC_R82600
diff --git a/baseconfig/x86/i686/CONFIG_EDAC_SBRIDGE b/baseconfig/x86/i686/CONFIG_EDAC_SBRIDGE
deleted file mode 100644
index 8ffe20d85..000000000
--- a/baseconfig/x86/i686/CONFIG_EDAC_SBRIDGE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EDAC_SBRIDGE is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X b/baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X
new file mode 100644
index 000000000..fe5952e70
--- /dev/null
+++ b/baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X
@@ -0,0 +1 @@
+CONFIG_EDAC_AMD76X=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX b/baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX
new file mode 100644
index 000000000..0322ddb69
--- /dev/null
+++ b/baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX
@@ -0,0 +1 @@
+CONFIG_EDAC_E7XXX=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82860 b/baseconfig/x86/i686PAE/CONFIG_EDAC_I82860
new file mode 100644
index 000000000..5e132db1a
--- /dev/null
+++ b/baseconfig/x86/i686PAE/CONFIG_EDAC_I82860
@@ -0,0 +1 @@
+CONFIG_EDAC_I82860=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P b/baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P
new file mode 100644
index 000000000..dbe32d406
--- /dev/null
+++ b/baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P
@@ -0,0 +1 @@
+CONFIG_EDAC_I82875P=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_R82600 b/baseconfig/x86/i686PAE/CONFIG_EDAC_R82600
new file mode 100644
index 000000000..93a01e506
--- /dev/null
+++ b/baseconfig/x86/i686PAE/CONFIG_EDAC_R82600
@@ -0,0 +1 @@
+CONFIG_EDAC_R82600=m
diff --git a/baseconfig/x86/i686PAE/CONFIG_EDAC_SBRIDGE b/baseconfig/x86/i686PAE/CONFIG_EDAC_SBRIDGE
deleted file mode 100644
index 8ffe20d85..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_EDAC_SBRIDGE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EDAC_SBRIDGE is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index a8ef33093..364f5c206 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1239,6 +1239,7 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
 CONFIG_DRM_DUMB_VGA_DAC=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
@@ -1419,7 +1420,6 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MV64X60=m
 CONFIG_EDAC_THUNDERX=m
 CONFIG_EDAC_XGENE=m
@@ -2711,7 +2711,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
@@ -5253,6 +5252,7 @@ CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
+CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_ZTE is not set
 CONFIG_SOFT_WATCHDOG=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 54ef50d52..d5c73f01b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1229,6 +1229,7 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
 CONFIG_DRM_DUMB_VGA_DAC=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
@@ -1409,7 +1410,6 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MV64X60=m
 CONFIG_EDAC_THUNDERX=m
 CONFIG_EDAC_XGENE=m
@@ -2692,7 +2692,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
@@ -5230,6 +5229,7 @@ CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_CAMERA is not set
+CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_ZTE is not set
 CONFIG_SOFT_WATCHDOG=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ff9dc5b35..23ee6cd83 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1018,7 +1018,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1539,7 +1538,6 @@ CONFIG_EDAC_GHES=y
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MV64X60=m
 CONFIG_EDAC_SYNOPSYS=m
 CONFIG_EDAC=y
@@ -2072,7 +2070,6 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
@@ -2900,7 +2897,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
@@ -5741,6 +5737,7 @@ CONFIG_SOC_OMAP5=y
 CONFIG_SOC_STIH407=y
 # CONFIG_SOC_STIH415 is not set
 # CONFIG_SOC_STIH416 is not set
+CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TI81XX=y
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_VF610 is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 3804af02d..925173b20 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -989,7 +989,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1460,7 +1459,6 @@ CONFIG_EDAC_GHES=y
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MV64X60=m
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
@@ -1978,7 +1976,6 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2773,7 +2770,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
@@ -5380,6 +5376,7 @@ CONFIG_SOC_EXYNOS5420=y
 CONFIG_SOC_EXYNOS5440=y
 CONFIG_SOC_EXYNOS5800=y
 # CONFIG_SOC_OMAP5 is not set
+CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_ZTE is not set
 CONFIG_SOFT_WATCHDOG=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index e5e473f2d..be561dade 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -987,7 +987,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1450,7 +1449,6 @@ CONFIG_EDAC_GHES=y
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MV64X60=m
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
@@ -1961,7 +1959,6 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2754,7 +2751,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
@@ -5357,6 +5353,7 @@ CONFIG_SOC_EXYNOS5420=y
 CONFIG_SOC_EXYNOS5440=y
 CONFIG_SOC_EXYNOS5800=y
 # CONFIG_SOC_OMAP5 is not set
+CONFIG_SOC_TEGRA_FLOWCTRL=y
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_ZTE is not set
 CONFIG_SOFT_WATCHDOG=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 2e9180921..45605ce52 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1016,7 +1016,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
@@ -1529,7 +1528,6 @@ CONFIG_EDAC_GHES=y
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_MV64X60=m
 CONFIG_EDAC_SYNOPSYS=m
 CONFIG_EDAC=y
@@ -2055,7 +2053,6 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
@@ -2881,7 +2878,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
@@ -5718,6 +5714,7 @@ CONFIG_SOC_OMAP5=y
 CONFIG_SOC_STIH407=y
 # CONFIG_SOC_STIH415 is not set
 # CONFIG_SOC_STIH416 is not set
+CONFIG_SOC_TEGRA_FLOWCTRL=y
 CONFIG_SOC_TI81XX=y
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_VF610 is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 5d0e69458..950baf780 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -843,7 +843,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
@@ -1293,9 +1292,7 @@ CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_R82600=m
-# CONFIG_EDAC_SBRIDGE is not set
 CONFIG_EDAC_X38=m
 CONFIG_EDAC=y
 CONFIG_EDD=m
@@ -2636,7 +2633,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index aab762e10..95e8a433c 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -845,7 +845,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
@@ -1304,9 +1303,7 @@ CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_R82600=m
-# CONFIG_EDAC_SBRIDGE is not set
 CONFIG_EDAC_X38=m
 CONFIG_EDAC=y
 CONFIG_EDD=m
@@ -2656,7 +2653,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 20b227530..b232f6371 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -845,7 +845,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
@@ -1304,9 +1303,7 @@ CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_R82600=m
-# CONFIG_EDAC_SBRIDGE is not set
 CONFIG_EDAC_X38=m
 CONFIG_EDAC=y
 CONFIG_EDD=m
@@ -2656,7 +2653,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-i686.config b/kernel-i686.config
index d553b5f8f..afc299078 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -843,7 +843,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
@@ -1293,9 +1292,7 @@ CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_R82600=m
-# CONFIG_EDAC_SBRIDGE is not set
 CONFIG_EDAC_X38=m
 CONFIG_EDAC=y
 CONFIG_EDD=m
@@ -2636,7 +2633,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index df81c7190..638251b9f 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -830,7 +830,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
@@ -1241,7 +1240,6 @@ CONFIG_EDAC_CPC925=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 # CONFIG_EDAC_MPC85XX is not set
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
@@ -2509,7 +2507,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 47364aba8..8da8882eb 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -828,7 +828,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
@@ -1230,7 +1229,6 @@ CONFIG_EDAC_CPC925=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 # CONFIG_EDAC_MPC85XX is not set
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
@@ -2489,7 +2487,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index f43074b96..ceca21672 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -785,7 +785,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
@@ -1195,7 +1194,6 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 # CONFIG_EDAC_MPC85XX is not set
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
@@ -2455,7 +2453,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 40daf5094..e4ba4b52c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -783,7 +783,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
@@ -1184,7 +1183,6 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 # CONFIG_EDAC_MPC85XX is not set
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
@@ -2435,7 +2433,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 5e0d46cb1..881567af9 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -785,7 +785,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
@@ -1194,7 +1193,6 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 # CONFIG_EDAC_MPC85XX is not set
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
@@ -2454,7 +2452,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index e4ccec690..e2957b2a2 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -783,7 +783,6 @@ CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
@@ -1183,7 +1182,6 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 # CONFIG_EDAC_MPC85XX is not set
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
@@ -2434,7 +2432,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index e93d0f472..e8c0dddce 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -783,7 +783,6 @@ CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DES_S390=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
@@ -1187,7 +1186,6 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
@@ -2393,7 +2391,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 1b84c7d7a..5c1134d27 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -781,7 +781,6 @@ CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DES_S390=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
@@ -1176,7 +1175,6 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC=y
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
@@ -2373,7 +2371,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 13467be6e..047aebed5 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -861,7 +861,6 @@ CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
@@ -1317,13 +1316,11 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_AMD64=m
-CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_AMD8131=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_E752X=m
-CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_I3000=m
 CONFIG_EDAC_I3200=m
@@ -1332,14 +1329,10 @@ CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I5400=m
 CONFIG_EDAC_I7300=m
 CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I82860=m
-CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_PND2=m
-CONFIG_EDAC_R82600=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_EDAC_SKX=m
 CONFIG_EDAC_X38=m
@@ -2696,7 +2689,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index c3a79ee47..7aeeb5e77 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -859,7 +859,6 @@ CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
 CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP=y
@@ -1306,13 +1305,11 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_AMD64=m
-CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_AMD8131=m
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_E752X=m
-CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_GHES=y
 CONFIG_EDAC_I3000=m
 CONFIG_EDAC_I3200=m
@@ -1321,14 +1318,10 @@ CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I5400=m
 CONFIG_EDAC_I7300=m
 CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I82860=m
-CONFIG_EDAC_I82875P=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
 CONFIG_EDAC_LEGACY_SYSFS=y
-CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_PND2=m
-CONFIG_EDAC_R82600=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_EDAC_SKX=m
 CONFIG_EDAC_X38=m
@@ -2676,7 +2669,6 @@ CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC=m
 CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SERIAL=m
 CONFIG_LIRC_SERIAL_TRANSMITTER=y
 CONFIG_LIRC_SIR=m