Cleanup some old config options, remove DRM drivers hidden behind DRM_LEGACY, tweak module filters a little (fpga, iio, few other bits), minor find optimisation

34 files changed, 52 insertions, 180 deletions

diff --git a/configs/fedora/generic/CONFIG_DRM_HISI_HIBMC b/configs/fedora/generic/CONFIG_DRM_HISI_HIBMC
index 3138ee3c9..869805497 100644
--- a/configs/fedora/generic/CONFIG_DRM_HISI_HIBMC
+++ b/configs/fedora/generic/CONFIG_DRM_HISI_HIBMC
@@ -1 +1 @@
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
diff --git a/configs/fedora/generic/CONFIG_DRM_MGA b/configs/fedora/generic/CONFIG_DRM_MGA
deleted file mode 100644
index d1cf1836c..000000000
--- a/configs/fedora/generic/CONFIG_DRM_MGA
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_MGA is not set
diff --git a/configs/fedora/generic/CONFIG_DRM_R128 b/configs/fedora/generic/CONFIG_DRM_R128
deleted file mode 100644
index 701800ad5..000000000
--- a/configs/fedora/generic/CONFIG_DRM_R128
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_R128 is not set
diff --git a/configs/fedora/generic/CONFIG_DRM_SAVAGE b/configs/fedora/generic/CONFIG_DRM_SAVAGE
deleted file mode 100644
index 614154be4..000000000
--- a/configs/fedora/generic/CONFIG_DRM_SAVAGE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_SAVAGE is not set
diff --git a/configs/fedora/generic/CONFIG_DRM_SIS b/configs/fedora/generic/CONFIG_DRM_SIS
deleted file mode 100644
index f1dd790a0..000000000
--- a/configs/fedora/generic/CONFIG_DRM_SIS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_SIS is not set
diff --git a/configs/fedora/generic/CONFIG_DRM_TDFX b/configs/fedora/generic/CONFIG_DRM_TDFX
deleted file mode 100644
index 36f8ba1f9..000000000
--- a/configs/fedora/generic/CONFIG_DRM_TDFX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_TDFX is not set
diff --git a/configs/fedora/generic/CONFIG_DRM_VIA b/configs/fedora/generic/CONFIG_DRM_VIA
deleted file mode 100644
index b54e19d33..000000000
--- a/configs/fedora/generic/CONFIG_DRM_VIA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_VIA=m
diff --git a/configs/fedora/generic/CONFIG_FIRMWARE_IN_KERNEL b/configs/fedora/generic/CONFIG_FIRMWARE_IN_KERNEL
deleted file mode 100644
index 19640bd61..000000000
--- a/configs/fedora/generic/CONFIG_FIRMWARE_IN_KERNEL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FIRMWARE_IN_KERNEL is not set
diff --git a/configs/fedora/generic/CONFIG_TEST_ASYNC_DRIVER_PROBE b/configs/fedora/generic/CONFIG_TEST_ASYNC_DRIVER_PROBE
index 40f4a33e8..2e3d64285 100644
--- a/configs/fedora/generic/CONFIG_TEST_ASYNC_DRIVER_PROBE
+++ b/configs/fedora/generic/CONFIG_TEST_ASYNC_DRIVER_PROBE
@@ -1 +1 @@
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT b/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT
deleted file mode 100644
index 276716ea2..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AD525X_DPOT=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT_I2C b/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT_I2C
deleted file mode 100644
index 121234256..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AD525X_DPOT_I2C=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT_SPI b/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT_SPI
deleted file mode 100644
index 27c1ece96..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AD525X_DPOT_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AD525X_DPOT_SPI=m
diff --git a/filter-aarch64.sh b/filter-aarch64.sh
index 85716f4ee..41dc7d19c 100644
--- a/filter-aarch64.sh
+++ b/filter-aarch64.sh
@@ -9,10 +9,10 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia power ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb staging tty uio uwb w1"
 
 ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
 
-drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i sun4i-drm-hdmi tinydrm vc4"
+drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel pl111 radeon rockchip tegra sun4i sun4i-drm-hdmi tinydrm vc4"
 
 singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls"
diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh
index 7124df04d..9d8187118 100644
--- a/filter-armv7hl.sh
+++ b/filter-armv7hl.sh
@@ -9,10 +9,10 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn media memstick message mwave nfc ntb pcmcia ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb staging tty uio uwb w1"
 
 ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom"
 
-drmdrvs="amd armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm omapdrm panel nouveau radeon rockchip sti sun4i sun4i-drm-hdmi tegra tilcdc tinydrm via vc4"
+drmdrvs="amd arm armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm nouveau omapdrm panel pl111 radeon rockchip sti sun4i sun4i-drm-hdmi tegra tilcdc tinydrm vc4"
 
 singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls bq27xxx_battery_hdq"
diff --git a/filter-i686.sh b/filter-i686.sh
index 792bcf150..29f2b3aa2 100644
--- a/filter-i686.sh
+++ b/filter-i686.sh
@@ -9,6 +9,6 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick mfd mmc mtd mwave nfc ntb pcmcia platform power ssb soundwire staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb soundwire staging tty uio uwb w1"
 
 singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub hid-sensor-magn-3d hid-sensor-incl-3d hid-sensor-gyro-3d hid-sensor-iio-common hid-sensor-accel-3d hid-sensor-trigger hid-sensor-als hid-sensor-rotation hid-sensor-temperature hid-sensor-humidity target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial regmap-sdw"
diff --git a/filter-modules.sh b/filter-modules.sh
index 261ecfe7d..e4f4267eb 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -14,7 +14,7 @@
 # listed here.
 
 # Set the default dirs/modules to filter out
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb soundwire staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb soundwire staging tty uio uwb w1"
 
 chardrvs="mwave pcmcia"
 
@@ -24,7 +24,7 @@ ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chels
 
 inputdrvs="gameport tablet touchscreen"
 
-scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic isci libsas lpfc megaraid mpt2sas mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf"
+scsidrvs="aacraid advansys aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic isci libsas lpfc megaraid mpt2sas mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf wd719x"
 
 usbdrvs="atm image misc serial wusbcore"
 
@@ -32,9 +32,11 @@ fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs jffs2 minix ncpfs nil
 
 netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
 
-drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via "
+drmdrvs="amd ast bridge gma500 i2c i915 mgag200 nouveau panel radeon"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial regmap-sdw"
+iiodrvs="accel adc afe common dac gyro health humidity light magnetometer multiplexer orientation potentiometer potentiostat pressure temperature"
+
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial regmap-sdw"
 
 # Grab the arch-specific filter list overrides
 source ./filter-$2.sh
diff --git a/filter-ppc64le.sh b/filter-ppc64le.sh
index d80956d2a..24d3f1346 100644
--- a/filter-ppc64le.sh
+++ b/filter-ppc64le.sh
@@ -9,6 +9,6 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds media memstick message mmc mtd mwave nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1"
 
 singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls"
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3e0d1a868..dc6adc735 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1419,7 +1419,7 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 CONFIG_DRM_HISI_KIRIN=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
@@ -1438,7 +1438,6 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_MSM_DSI_20NM_PHY=y
@@ -1477,17 +1476,14 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
 CONFIG_DRM_ROCKCHIP=m
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_STM is not set
 CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
@@ -1496,7 +1492,6 @@ CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
@@ -1510,7 +1505,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1817,7 +1811,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -6115,7 +6108,7 @@ CONFIG_TEGRA_WATCHDOG=m
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 15b7078bb..02e1e176d 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1409,7 +1409,7 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 CONFIG_DRM_HISI_KIRIN=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
@@ -1428,7 +1428,6 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_MSM_DSI_20NM_PHY=y
@@ -1467,17 +1466,14 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
 CONFIG_DRM_ROCKCHIP=m
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_STM is not set
 CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
@@ -1486,7 +1482,6 @@ CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
@@ -1500,7 +1495,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1799,7 +1793,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -6091,7 +6084,7 @@ CONFIG_TEGRA_WATCHDOG=m
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d7e454756..dda2ebcb2 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -51,9 +51,7 @@ CONFIG_ACPI_TAD=m
 # CONFIG_AD2S1210 is not set
 # CONFIG_AD2S90 is not set
 # CONFIG_AD5064 is not set
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_AD525X_DPOT is not set
 CONFIG_AD5272=m
 # CONFIG_AD5360 is not set
 # CONFIG_AD5380 is not set
@@ -1494,7 +1492,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1518,7 +1516,6 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_MSM_DSI_20NM_PHY=y
@@ -1573,17 +1570,14 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
 CONFIG_DRM_ROCKCHIP=m
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 CONFIG_DRM_STI=m
 # CONFIG_DRM_STM is not set
 CONFIG_DRM_SUN4I_BACKEND=m
@@ -1593,7 +1587,6 @@ CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
@@ -1610,7 +1603,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1932,7 +1924,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -6551,7 +6542,7 @@ CONFIG_TEGRA_WATCHDOG=m
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4a3185521..9d55daf75 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -51,9 +51,7 @@ CONFIG_ACPI_TAD=m
 # CONFIG_AD2S1210 is not set
 # CONFIG_AD2S90 is not set
 # CONFIG_AD5064 is not set
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_AD525X_DPOT is not set
 CONFIG_AD5272=m
 # CONFIG_AD5360 is not set
 # CONFIG_AD5380 is not set
@@ -1435,7 +1433,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1454,7 +1452,6 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
@@ -1485,17 +1482,14 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
 CONFIG_DRM_ROCKCHIP=m
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 CONFIG_DRM_STI=m
 # CONFIG_DRM_STM is not set
 CONFIG_DRM_SUN4I_BACKEND=m
@@ -1505,7 +1499,6 @@ CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
@@ -1521,7 +1514,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1836,7 +1828,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -6150,7 +6141,7 @@ CONFIG_TEGRA_WATCHDOG=m
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index cf53760f0..8a754975e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -51,9 +51,7 @@ CONFIG_ACPI_TAD=m
 # CONFIG_AD2S1210 is not set
 # CONFIG_AD2S90 is not set
 # CONFIG_AD5064 is not set
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_AD525X_DPOT is not set
 CONFIG_AD5272=m
 # CONFIG_AD5360 is not set
 # CONFIG_AD5380 is not set
@@ -1425,7 +1423,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1444,7 +1442,6 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
@@ -1475,17 +1472,14 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
 CONFIG_DRM_ROCKCHIP=m
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 CONFIG_DRM_STI=m
 # CONFIG_DRM_STM is not set
 CONFIG_DRM_SUN4I_BACKEND=m
@@ -1495,7 +1489,6 @@ CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
@@ -1511,7 +1504,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1818,7 +1810,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -6126,7 +6117,7 @@ CONFIG_TEGRA_WATCHDOG=m
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index dc21d1741..9a8e24909 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -51,9 +51,7 @@ CONFIG_ACPI_TAD=m
 # CONFIG_AD2S1210 is not set
 # CONFIG_AD2S90 is not set
 # CONFIG_AD5064 is not set
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_AD525X_DPOT is not set
 CONFIG_AD5272=m
 # CONFIG_AD5360 is not set
 # CONFIG_AD5380 is not set
@@ -1484,7 +1482,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
 CONFIG_DRM_I2C_ADV7511=m
@@ -1508,7 +1506,6 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON_DW_HDMI=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_MSM_DSI_14NM_PHY=y
 CONFIG_DRM_MSM_DSI_20NM_PHY=y
@@ -1563,17 +1560,14 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_PL111=m
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
 CONFIG_DRM_ROCKCHIP=m
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 CONFIG_DRM_STI=m
 # CONFIG_DRM_STM is not set
 CONFIG_DRM_SUN4I_BACKEND=m
@@ -1583,7 +1577,6 @@ CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
 CONFIG_DRM_TEGRA=m
 CONFIG_DRM_TEGRA_STAGING=y
@@ -1600,7 +1593,6 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VC4_HDMI_CEC=y
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1914,7 +1906,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -6527,7 +6518,7 @@ CONFIG_TEGRA_WATCHDOG=m
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 5a60dc6e6..6a9b4f1f9 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1240,7 +1240,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1262,7 +1262,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1289,18 +1288,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1308,7 +1303,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -1641,7 +1635,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
@@ -5741,7 +5734,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 78176014f..631db1fd3 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1253,7 +1253,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1275,7 +1275,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1302,18 +1301,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1321,7 +1316,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -1662,7 +1656,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
@@ -5766,7 +5759,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index eb64b0e28..4b5df0c2d 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1253,7 +1253,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1275,7 +1275,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1302,18 +1301,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1321,7 +1316,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -1662,7 +1656,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
@@ -5766,7 +5759,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 64e372053..da03a7895 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1240,7 +1240,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1262,7 +1262,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1289,18 +1288,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1308,7 +1303,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -1641,7 +1635,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_FM10K=m
@@ -5741,7 +5734,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2856eb976..0c28bca39 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1171,7 +1171,7 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1184,7 +1184,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1211,18 +1210,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1230,7 +1225,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_VBOXVIDEO is not set
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1528,7 +1522,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -5455,7 +5448,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 117e2de44..48a93c875 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1158,7 +1158,7 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1171,7 +1171,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1198,18 +1197,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1217,7 +1212,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_VBOXVIDEO is not set
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1507,7 +1501,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -5428,7 +5421,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index fcf4fe82b..917c5abde 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1171,7 +1171,7 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1184,7 +1184,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1211,18 +1210,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1230,7 +1225,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_VBOXVIDEO is not set
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1514,7 +1508,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -5348,7 +5341,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d3bda25ff..871cc9c2a 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1158,7 +1158,7 @@ CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1171,7 +1171,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1198,18 +1197,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1217,7 +1212,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_VBOXVIDEO is not set
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_XEN is not set
@@ -1493,7 +1487,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -5321,7 +5314,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 35f1923ba..9eb8107d3 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1299,7 +1299,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1321,7 +1321,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1348,18 +1347,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1367,7 +1362,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -1705,7 +1699,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -5816,7 +5809,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index d31ace475..f85d8775b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1286,7 +1286,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 # CONFIG_DRM_GMA600 is not set
-CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
@@ -1308,7 +1308,6 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
-# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
@@ -1335,18 +1334,14 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
 CONFIG_DRM_QXL=m
-# CONFIG_DRM_R128 is not set
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_SAVAGE is not set
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SIS is not set
 # CONFIG_DRM_SUN6I_DSI is not set
-# CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_TFP410=m
@@ -1354,7 +1349,6 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_VBOXVIDEO=m
 CONFIG_DRM_VGEM=m
-CONFIG_DRM_VIA=m
 CONFIG_DRM_VIRTIO_GPU=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -1684,7 +1678,6 @@ CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
@@ -5791,7 +5784,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TELCLOCK=m
 CONFIG_TERANETICS_PHY=m
-CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_BPF is not set
diff --git a/kernel.spec b/kernel.spec
index 2fc82f904..00b39c8b8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1165,10 +1165,10 @@ cd ..
 # End of Configs stuff
 
 # get rid of unwanted files resulting from patch fuzz
-find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
+find . \( -name "*.orig" -o -name "*~" \) -delete >/dev/null
 
 # remove unnecessary SCM files
-find . -name .gitignore -exec rm -f {} \; >/dev/null
+find . -name .gitignore -delete >/dev/null
 
 cd ..