diff --git a/config-arm-generic b/config-arm-generic
index b2acb68a3..4759a441d 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -142,7 +142,6 @@ CONFIG_ARCH_BCM2835=y
 CONFIG_SERIAL_8250_BCM2835AUX=y
 CONFIG_DMA_BCM2835=m
 CONFIG_MMC_SDHCI_IPROC=m
-CONFIG_MMC_BCM2835_SDHOST=m
 CONFIG_BCM2835_MBOX=y
 CONFIG_PWM_BCM2835=m
 CONFIG_HW_RANDOM_BCM2835=m
@@ -706,6 +705,3 @@ CONFIG_NET_VENDOR_MELLANOX=y
 
 # CONFIG_HISILICON_IRQ_MBIGEN is not set
 # CONFIG_QRTR is not set
-
-# This Xilinx option is now built for arm64 as well as ARM
-CONFIG_XILINX_VDMA=m
diff --git a/config-arm64 b/config-arm64
index 259b8e240..c4d0a1e72 100644
--- a/config-arm64
+++ b/config-arm64
@@ -76,7 +76,6 @@ CONFIG_HVC_DRIVER=y
 CONFIG_HZ=100
 
 CONFIG_KVM=y
-CONFIG_KVM_NEW_VGIC=y
 
 CONFIG_RCU_FANOUT=64
 CONFIG_SPARSE_IRQ=y
@@ -188,12 +187,10 @@ CONFIG_GPIO_MAX77620=m
 CONFIG_TEGRA_ACONNECT=y
 
 # AllWinner
-CONFIG_MACH_SUN50I=y
 CONFIG_SUNXI_RSB=m
 CONFIG_AHCI_SUNXI=m
 CONFIG_NET_VENDOR_ALLWINNER=y
 # CONFIG_SUN4I_EMAC is not set
-CONFIG_SUN8I_EMAC=m
 # CONFIG_MDIO_SUN4I is not set
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 # CONFIG_TOUCHSCREEN_SUN4I is not set
diff --git a/config-armv7 b/config-armv7
index 0207f9ab9..eea55a205 100644
--- a/config-armv7
+++ b/config-armv7
@@ -313,7 +313,6 @@ CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_GSBI=m
 CONFIG_QCOM_PM=y
 CONFIG_PHY_QCOM_APQ8064_SATA=m
-CONFIG_USB_DWC3_QCOM=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_DSI is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index ee6d9c215..5f8e812e2 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -224,7 +224,6 @@ CONFIG_IR_SUNXI=m
 CONFIG_MDIO_SUN4I=m
 CONFIG_DWMAC_SUNXI=m
 CONFIG_SUN4I_EMAC=m
-CONFIG_SUN8I_EMAC=m
 CONFIG_RTC_DRV_SUN6I=m
 CONFIG_MTD_NAND_SUNXI=m
 CONFIG_SERIO_SUN4I_PS2=m
@@ -255,7 +254,6 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_EXYNOS5420_MCPM=y
-CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m
 # CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
 # CONFIG_EXYNOS5420_MCPM not set
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
@@ -331,7 +329,6 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
-CONFIG_SND_SOC_ODROIDX2=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
 # CONFIG_SAMSUNG_PM_DEBUG is not set
@@ -598,7 +595,6 @@ CONFIG_BATTERY_SBS=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_BH1780=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_ISL29018=m
 CONFIG_SENSORS_ISL29028=m
@@ -637,7 +633,6 @@ CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_SYSCON=y
-CONFIG_BMP085_SPI=m
 
 CONFIG_MFD_SYSCON=y
 CONFIG_GPIO_SYSCON=m
diff --git a/config-armv7-lpae b/config-armv7-lpae
index fb7177b85..e832781e2 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -20,7 +20,6 @@ CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
-CONFIG_KVM_NEW_VGIC=y
 
 # CONFIG_XEN is not set
 CONFIG_XEN_FBDEV_FRONTEND=y
diff --git a/config-generic b/config-generic
index c524f40d2..6bd3b4eb1 100644
--- a/config-generic
+++ b/config-generic
@@ -380,7 +380,6 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
 CONFIG_ZRAM=m
-# CONFIG_ZRAM_LZ4_COMPRESS is not set
 
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
@@ -1465,7 +1464,6 @@ CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
 CONFIG_CHELSIO_T4_DCB=y
 # CONFIG_CHELSIO_T4_FCOE is not set
-# CONFIG_CHELSIO_T4_UWIRE is not set
 
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
@@ -1496,7 +1494,6 @@ CONFIG_SUNDANCE=m
 
 CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_BE2NET=m
-CONFIG_BE2NET_VXLAN=y
 # CONFIG_BE2NET_HWMON is not set
 
 CONFIG_NET_VENDOR_EXAR=y
@@ -1522,16 +1519,12 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
-CONFIG_IXGBE_VXLAN=y
 CONFIG_IXGBE_HWMON=y
 CONFIG_I40E=m
-CONFIG_I40E_VXLAN=y
 # CONFIG_I40E_DCB is not set
 # CONFIG_I40E_FCOE is not set
-CONFIG_I40E_GENEVE=y
 CONFIG_I40EVF=m
 CONFIG_FM10K=m
-# CONFIG_FM10K_VXLAN is not set
 
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_MARVELL=y
@@ -1582,15 +1575,12 @@ CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLCNIC_DCB=y
-CONFIG_QLCNIC_VXLAN=y
 CONFIG_QLCNIC_HWMON=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
 CONFIG_QEDE=m
 CONFIG_QED_SRIOV=y
-# CONFIG_QEDE_VXLAN is not set
-# CONFIG_QEDE_GENEVE is not set
 
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
@@ -1711,8 +1701,6 @@ CONFIG_BCMGENET=m
 CONFIG_BNX2=m
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
-CONFIG_BNX2X_GENEVE=y
 CONFIG_CNIC=m
 CONFIG_FEALNX=m
 CONFIG_ETHOC=m
@@ -1730,12 +1718,10 @@ CONFIG_JME=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_EN_VXLAN=y
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_CORE=m
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_EN_DCB=y
-CONFIG_MLX5_CORE_EN_VXLAN=y
 CONFIG_MLX5_INFINIBAND=m
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
@@ -1911,7 +1897,6 @@ CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_UAPSD is not set
 CONFIG_IWLWIFI_PCIE_RTPM=y
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
@@ -1922,7 +1907,6 @@ CONFIG_IWLEGACY_DEBUGFS=y
 CONFIG_IWL4965=y
 CONFIG_IWL3945=m
 # CONFIG_IWM is not set
-# CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set
 
 CONFIG_MAC80211_HWSIM=m
 CONFIG_P54_COMMON=m
@@ -2696,7 +2680,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 # CONFIG_SERIAL_IFX6X60 is not set
 
 CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_PRINTER=m
 CONFIG_LP_CONSOLE=y
@@ -2905,7 +2888,6 @@ CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_LTC4261=m
-# CONFIG_SENSORS_BH1780 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_SMM665 is not set
 # CONFIG_SENSORS_EMC2103 is not set
@@ -3147,11 +3129,8 @@ CONFIG_PA12203001=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_ADIS16201 is not set
 # CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16204 is not set
 # CONFIG_ADIS16209 is not set
-# CONFIG_ADIS16220 is not set
 # CONFIG_ADIS16240 is not set
-# CONFIG_LIS3L02DQ is not set
 # CONFIG_SCA3000 is not set
 # CONFIG_AD7780 is not set
 # CONFIG_AD7816 is not set
@@ -3171,13 +3150,10 @@ CONFIG_PA12203001=m
 
 
 # CONFIG_HMC6352 is not set
-# CONFIG_BMP085 is not set
-# CONFIG_BMP085_I2C is not set
 # CONFIG_PCH_PHUB is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_SRAM is not set
 # CONFIG_TI_DAC7512 is not set
-# CONFIG_BMP085_SPI is not set
 # CONFIG_MMA7455_SPI is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 
@@ -3215,7 +3191,6 @@ CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_POWEROFF=m
 
@@ -3552,7 +3527,6 @@ CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
-# CONFIG_VIDEO_TIMBERDALE is not set
 # CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_VIDEO_TW68 is not set
 # CONFIG_VIDEO_VIVID is not set
@@ -3850,12 +3824,10 @@ CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQUENCER=y
 CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=y
 CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_RTCTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
@@ -4963,7 +4935,6 @@ CONFIG_DEBUG_BOOT_PARAMS=y
 CONFIG_DEBUG_VM=y
 # CONFIG_DEBUG_VM_VMACACHE is not set
 # CONFIG_DEBUG_VM_RB is not set # revisit this if performance isn't horrible
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -5461,7 +5432,6 @@ CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 # CONFIG_LEDS_TRIGGER_CPU is not set
@@ -5785,7 +5755,6 @@ CONFIG_USBIP_VHCI_NR_HCS=1
 # CONFIG_DVB_MN88473 is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_FB_SM750 is not set
-# CONFIG_STAGING_RDMA is not set
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
 # CONFIG_LNET is not set
diff --git a/config-powerpc64 b/config-powerpc64
index 0edf37b51..b0708a94f 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -76,7 +76,6 @@ CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
 CONFIG_I2C_POWERMAC=y
 CONFIG_PMAC_RACKMETER=m
 CONFIG_PMAC_APM_EMU=m
diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index fcd3a49a4..9672938bf 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -148,7 +148,6 @@ CONFIG_IO_EVENT_IRQ=y
 
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
-# CONFIG_GEN_RTC_X is not set
 CONFIG_RTC_DRV_GENERIC=y
 # CONFIG_CMDLINE_BOOL is not set
 
@@ -310,7 +309,6 @@ CONFIG_PPC_EMULATED_STATS=y
 CONFIG_SWIOTLB=y
 
 CONFIG_PPC_DISABLE_WERROR=y
-# CONFIG_STRICT_MM_TYPECHECKS is not set
 
 # CONFIG_XILINX_LL_TEMAC is not set
 # CONFIG_XILINX_EMACLITE is not set
diff --git a/config-s390x b/config-s390x
index e235e9e01..5368c0109 100644
--- a/config-s390x
+++ b/config-s390x
@@ -223,7 +223,6 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 
 CONFIG_PCI=y
 CONFIG_PCI_NR_FUNCTIONS=64
-CONFIG_PCI_NR_MSI=256
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_SHPC=y
 CONFIG_HOTPLUG_PCI_S390=y
diff --git a/config-x86-generic b/config-x86-generic
index f011f027d..c6ca6d537 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -19,7 +19,6 @@ CONFIG_MICROCODE_AMD=y
 CONFIG_PERF_EVENTS_AMD_POWER=m
 CONFIG_PERF_EVENTS_INTEL_UNCORE=m
 CONFIG_PERF_EVENTS_INTEL_RAPL=m
-CONFIG_PERF_EVENTS_CSTATE=m
 CONFIG_PERF_EVENTS_INTEL_CSTATE=m
 
 CONFIG_X86_MSR=y
@@ -93,7 +92,6 @@ CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 CONFIG_ACPI_CONFIGFS=m
 # FIXME: Next two are deprecated. Remove them when they disappear upstream
 # CONFIG_ACPI_PROCFS_POWER is not set
@@ -602,4 +600,3 @@ CONFIG_PCH_CAN=m
 
 # CONFIG_X86_DEBUG_FPU is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set
-# CONFIG_AMD_MCE_INJ is not set
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 38c2a1829..8330c1a03 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -41,7 +41,6 @@ CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
 
 CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_STATS=y
 CONFIG_AMD_IOMMU_V2=m
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_SWIOTLB=y
@@ -239,7 +238,6 @@ CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM=m
 
 # Staging
-CONFIG_STAGING_RDMA=y
 CONFIG_INFINIBAND_HFI1=m
 # CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
 CONFIG_HFI1_VERBS_31BIT_PSN=y