Re-order config

20 files changed, 236 insertions, 178 deletions

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 99a81253d..1f7093597 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -104,11 +104,6 @@ CONFIG_AGP=y
 CONFIG_AGP_AMD64=y
 
 ##
-## file: drivers/dma/Kconfig
-##
-CONFIG_INTEL_MIC_X100_DMA=m
-
-##
 ## file: drivers/edac/Kconfig
 ##
 CONFIG_EDAC_SBRIDGE=m
@@ -133,7 +128,7 @@ CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 
 ##
-## file: drivers/iommu/Kconfig
+## file: drivers/iommu/amd/Kconfig
 ##
 CONFIG_AMD_IOMMU=y
 #. Can be built as a module, but nothing will trigger loading
@@ -146,18 +141,6 @@ CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 
 ##
-## file: drivers/misc/mic/Kconfig
-##
-CONFIG_INTEL_MIC_BUS=m
-CONFIG_SCIF_BUS=m
-CONFIG_VOP_BUS=m
-CONFIG_INTEL_MIC_HOST=m
-# CONFIG_INTEL_MIC_CARD is not set
-CONFIG_SCIF=m
-CONFIG_MIC_COSM=m
-CONFIG_VOP=m
-
-##
 ## file: drivers/net/Kconfig
 ##
 CONFIG_FUJITSU_ES=m
@@ -269,3 +252,16 @@ CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 ##
 CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y
 
+##
+## file: unknown
+##
+CONFIG_INTEL_MIC_BUS=m
+# CONFIG_INTEL_MIC_CARD is not set
+CONFIG_INTEL_MIC_HOST=m
+CONFIG_INTEL_MIC_X100_DMA=m
+CONFIG_MIC_COSM=m
+CONFIG_SCIF=m
+CONFIG_SCIF_BUS=m
+CONFIG_VOP=m
+CONFIG_VOP_BUS=m
+
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 281e74ca5..a5cb3b24d 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -1,4 +1,9 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_SECCOMP=y
+
+##
 ## file: arch/arm64/Kconfig
 ##
 CONFIG_ARM64_ERRATUM_834220=y
@@ -11,7 +16,6 @@ CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=256
 CONFIG_NUMA=y
-CONFIG_SECCOMP=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 CONFIG_XEN=y
@@ -833,16 +837,20 @@ CONFIG_FDDI=y
 CONFIG_SKFP=m
 
 ##
-## file: drivers/net/phy/Kconfig
+## file: drivers/net/mdio/Kconfig
 ##
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_XGENE=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_THUNDER=m
-CONFIG_MDIO_XGENE=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+
+##
+## file: drivers/net/phy/Kconfig
+##
+CONFIG_MESON_GXL_PHY=m
 CONFIG_BCM54140_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
-CONFIG_MESON_GXL_PHY=m
 CONFIG_AT803X_PHY=m
 
 ##
@@ -991,7 +999,6 @@ CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
-CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 
@@ -1030,8 +1037,6 @@ CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
 ##
 ## file: drivers/platform/chrome/Kconfig
 ##
-#. Obsolete compatibility option
-# CONFIG_MFD_CROS_EC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC=m
 CONFIG_CROS_EC_I2C=m
@@ -1039,12 +1044,6 @@ CONFIG_CROS_EC_SPI=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 
 ##
-## file: drivers/power/avs/Kconfig
-##
-CONFIG_POWER_AVS=y
-CONFIG_ROCKCHIP_IODOMAIN=m
-
-##
 ## file: drivers/power/reset/Kconfig
 ##
 CONFIG_POWER_RESET_HISI=y
@@ -1176,6 +1175,7 @@ CONFIG_QCOM_WCNSS_CTRL=m
 ##
 ## file: drivers/soc/rockchip/Kconfig
 ##
+CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 
 ##
@@ -1392,7 +1392,6 @@ CONFIG_VFIO_PCI=m
 ##
 ## file: drivers/video/backlight/Kconfig
 ##
-CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_LP855X=m
 
@@ -1527,3 +1526,12 @@ CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_MAX98090=m
 CONFIG_SND_SOC_TEGRA_RT5677=m
 
+##
+## file: unknown
+##
+CONFIG_BACKLIGHT_GENERIC=m
+#. Obsolete compatibility option
+# CONFIG_MFD_CROS_EC is not set
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_POWER_AVS=y
+
diff --git a/debian/config/arm64/rt/config b/debian/config/arm64/rt/config
index b0f08e9b4..23bd5f3ab 100644
--- a/debian/config/arm64/rt/config
+++ b/debian/config/arm64/rt/config
@@ -1,3 +1,7 @@
+##
+## file: arch/arm64/kvm/Kconfig
+##
 #. ARCH_SUPPORTS_RT depends on HAVE_POSIX_CPU_TIMERS_TASK_WORK
 #. HAVE_POSIX_CPU_TIMERS_TASK_WORK depneds on !KVM
 # CONFIG_KVM is not set
+
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index e00417c41..37aa9446e 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -980,10 +980,10 @@ CONFIG_FDDI=y
 CONFIG_SKFP=m
 
 ##
-## file: drivers/net/phy/Kconfig
+## file: drivers/net/mdio/Kconfig
 ##
-CONFIG_MDIO_ASPEED=m
 CONFIG_MDIO_SUN4I=y
+CONFIG_MDIO_ASPEED=m
 
 ##
 ## file: drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig
@@ -1115,8 +1115,6 @@ CONFIG_PINCTRL_WM8850=y
 ##
 ## file: drivers/platform/chrome/Kconfig
 ##
-#. Obsolete compatibility option
-# CONFIG_MFD_CROS_EC is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC=m
 CONFIG_CROS_EC_SPI=m
@@ -1128,12 +1126,6 @@ CONFIG_OLPC_XO175=y
 CONFIG_OLPC_XO175_EC=m
 
 ##
-## file: drivers/power/avs/Kconfig
-##
-CONFIG_POWER_AVS=y
-CONFIG_ROCKCHIP_IODOMAIN=m
-
-##
 ## file: drivers/power/reset/Kconfig
 ##
 CONFIG_POWER_RESET=y
@@ -1270,6 +1262,7 @@ CONFIG_RASPBERRYPI_POWER=y
 ##
 ## file: drivers/soc/rockchip/Kconfig
 ##
+CONFIG_ROCKCHIP_IODOMAIN=m
 CONFIG_ROCKCHIP_PM_DOMAINS=y
 
 ##
@@ -1660,3 +1653,10 @@ CONFIG_SND_SOC_OMAP3_PANDORA=m
 CONFIG_SND_SOC_OMAP3_TWL4030=m
 CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
 
+##
+## file: unknown
+##
+#. Obsolete compatibility option
+# CONFIG_MFD_CROS_EC is not set
+CONFIG_POWER_AVS=y
+
diff --git a/debian/config/config b/debian/config/config
index dbe0e2490..99a8a9274 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -171,6 +171,25 @@ CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 
 ##
+## file: drivers/accessibility/speakup/Kconfig
+##
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+
+##
 ## file: drivers/acpi/Kconfig
 ##
 # CONFIG_ACPI_DEBUGGER is not set
@@ -178,7 +197,6 @@ CONFIG_ACPI_TAD=m
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_BGRT is not set
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-# CONFIG_PMIC_OPREGION is not set
 # CONFIG_ACPI_CONFIGFS is not set
 
 ##
@@ -187,6 +205,11 @@ CONFIG_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_NFIT=m
 
 ##
+## file: drivers/acpi/pmic/Kconfig
+##
+# CONFIG_PMIC_OPREGION is not set
+
+##
 ## file: drivers/android/Kconfig
 ##
 # CONFIG_ANDROID is not set
@@ -2705,7 +2728,6 @@ CONFIG_PCF50633_GPIO=m
 # CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_AB3100_CORE is not set
 CONFIG_AB3100_OTP=m
@@ -3635,40 +3657,40 @@ CONFIG_IEEE802154_ADF7242=m
 CONFIG_IEEE802154_HWSIM=m
 
 ##
-## file: drivers/net/phy/Kconfig
+## file: drivers/net/mdio/Kconfig
 ##
 CONFIG_MDIO_DEVICE=m
-# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_MSCC_MIIM is not set
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
+##
+## file: drivers/net/phy/Kconfig
+##
 CONFIG_PHYLIB=m
 CONFIG_LED_TRIGGER_PHY=y
+#. Must only be enabled for specific flavours
+# CONFIG_FIXED_PHY is not set
 CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
 # CONFIG_AX88796B_PHY is not set
+CONFIG_BROADCOM_PHY=m
 # CONFIG_BCM63XX_PHY is not set
 # CONFIG_BCM7XXX_PHY is not set
 CONFIG_BCM87XX_PHY=m
-CONFIG_BROADCOM_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_CORTINA_PHY=m
 CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-CONFIG_DP83TC811_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-#. Must only be enabled for specific flavours
-# CONFIG_FIXED_PHY is not set
 CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
 # CONFIG_INTEL_XWAY_PHY is not set
 CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MICREL_PHY=m
@@ -3684,6 +3706,10 @@ CONFIG_ROCKCHIP_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_STE10XP=m
 CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
 CONFIG_VITESSE_PHY=m
 # CONFIG_XILINX_GMII2RGMII is not set
 # CONFIG_MICREL_KS8995MA is not set
@@ -4350,7 +4376,6 @@ CONFIG_YENTA_TOSHIBA=y
 ##
 ## file: drivers/platform/chrome/Kconfig
 ##
-# CONFIG_MFD_CROS_EC is not set
 # CONFIG_CHROME_PLATFORMS is not set
 
 ##
@@ -4364,11 +4389,6 @@ CONFIG_YENTA_TOSHIBA=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 
 ##
-## file: drivers/power/avs/Kconfig
-##
-# CONFIG_POWER_AVS is not set
-
-##
 ## file: drivers/power/reset/Kconfig
 ##
 # CONFIG_POWER_RESET is not set
@@ -4903,21 +4923,6 @@ CONFIG_ASHMEM=m
 # CONFIG_STAGING_MEDIA is not set
 
 ##
-## file: drivers/staging/media/soc_camera/Kconfig
-##
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_SOC_CAMERA_MT9M111 is not set
-# CONFIG_SOC_CAMERA_MT9V022 is not set
-# CONFIG_SOC_CAMERA_OV9740 is not set
-# CONFIG_SOC_CAMERA_IMX074 is not set
-# CONFIG_SOC_CAMERA_MT9T031 is not set
-
-##
-## file: drivers/staging/media/usbvision/Kconfig
-##
-CONFIG_VIDEO_USBVISION=m
-
-##
 ## file: drivers/staging/qlge/Kconfig
 ##
 CONFIG_QLGE=m
@@ -4959,25 +4964,6 @@ CONFIG_R8712U=m
 # CONFIG_FB_SM750 is not set
 
 ##
-## file: drivers/staging/speakup/Kconfig
-##
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-
-##
 ## file: drivers/staging/vt6655/Kconfig
 ##
 # CONFIG_VT6655 is not set
@@ -5043,7 +5029,6 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_CLOCK_THERMAL is not set
 CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
@@ -5166,8 +5151,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_OTG_FSM is not set
 CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 
@@ -5462,7 +5445,6 @@ CONFIG_VHOST_VSOCK=m
 ##
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
 # CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
@@ -5473,7 +5455,6 @@ CONFIG_BACKLIGHT_WM831X=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_OT200 is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -5482,7 +5463,6 @@ CONFIG_BACKLIGHT_WM831X=m
 ##
 ## file: drivers/video/console/Kconfig
 ##
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -5969,7 +5949,6 @@ CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
-# CONFIG_NFSD_FAULT_INJECTION is not set
 
 ##
 ## file: fs/nilfs2/Kconfig
@@ -6398,7 +6377,6 @@ CONFIG_RCU_FAST_NO_HZ=y
 ##
 ## file: kernel/rcu/Kconfig.debug
 ##
-# CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_TRACE is not set
@@ -7872,7 +7850,6 @@ CONFIG_SND_PDAUDIOCF=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
-# CONFIG_SND_SOC_MAX98373 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_PCM1681 is not set
@@ -8032,3 +8009,26 @@ CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
 
+##
+## file: unknown
+##
+# CONFIG_BACKLIGHT_GENERIC is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_CLOCK_THERMAL is not set
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_NFSD_FAULT_INJECTION is not set
+# CONFIG_POWER_AVS is not set
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_SND_SOC_MAX98373 is not set
+# CONFIG_SOC_CAMERA is not set
+# CONFIG_SOC_CAMERA_IMX074 is not set
+# CONFIG_SOC_CAMERA_MT9M111 is not set
+# CONFIG_SOC_CAMERA_MT9T031 is not set
+# CONFIG_SOC_CAMERA_MT9V022 is not set
+# CONFIG_SOC_CAMERA_OV9740 is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_VIDEO_USBVISION=m
+
diff --git a/debian/config/config.cloud b/debian/config/config.cloud
index 08642b847..679974133 100644
--- a/debian/config/config.cloud
+++ b/debian/config/config.cloud
@@ -455,7 +455,7 @@ CONFIG_HYPERV_KEYBOARD=m
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/iommu/Kconfig
+## file: drivers/iommu/amd/Kconfig
 ##
 # CONFIG_AMD_IOMMU is not set
 
@@ -565,13 +565,6 @@ CONFIG_HYPERV_KEYBOARD=m
 # CONFIG_INTEL_MEI_ME is not set
 
 ##
-## file: drivers/misc/mic/Kconfig
-##
-# CONFIG_INTEL_MIC_BUS is not set
-# CONFIG_SCIF_BUS is not set
-# CONFIG_VOP_BUS is not set
-
-##
 ## file: drivers/mmc/Kconfig
 ##
 # CONFIG_MMC is not set
@@ -892,9 +885,13 @@ CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_HYPERV_NET=m
 
 ##
-## file: drivers/net/phy/Kconfig
+## file: drivers/net/mdio/Kconfig
 ##
 # CONFIG_MDIO_DEVICE is not set
+
+##
+## file: drivers/net/phy/Kconfig
+##
 # CONFIG_PHYLIB is not set
 
 ##
@@ -1661,3 +1658,10 @@ CONFIG_SECURITY_INFINIBAND=y
 ##
 # CONFIG_SOUND is not set
 
+##
+## file: unknown
+##
+# CONFIG_INTEL_MIC_BUS is not set
+# CONFIG_SCIF_BUS is not set
+# CONFIG_VOP_BUS is not set
+
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 17c47c916..2f1edaaca 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -60,6 +60,11 @@ CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TWOFISH_586=m
 
 ##
+## file: drivers/accessibility/speakup/Kconfig
+##
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+
+##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_PATA_CS5520=m
@@ -161,7 +166,7 @@ CONFIG_MOUSE_LOGIBM=m
 CONFIG_MOUSE_PC110PAD=m
 
 ##
-## file: drivers/iommu/Kconfig
+## file: drivers/iommu/intel/Kconfig
 ##
 # CONFIG_INTEL_IOMMU is not set
 
@@ -394,11 +399,6 @@ CONFIG_COMEDI_MULTIQ3=m
 CONFIG_FB_OLPC_DCON=m
 
 ##
-## file: drivers/staging/speakup/Kconfig
-##
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-
-##
 ## file: drivers/tty/Kconfig
 ##
 # CONFIG_ISI is not set
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 1ef7b9328..9306f3523 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -6,7 +6,6 @@ CONFIG_SCHED_SMT=y
 CONFIG_PERMIT_BSP_REMOVE=y
 CONFIG_NODES_SHIFT=8
 CONFIG_IA64_MCA_RECOVERY=m
-CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=m
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
@@ -774,3 +773,8 @@ CONFIG_SND_YMFPCI=m
 ##
 CONFIG_SND_HDA_INTEL=m
 
+##
+## file: unknown
+##
+CONFIG_PERFMON=y
+
diff --git a/debian/config/kernelarch-arm/config b/debian/config/kernelarch-arm/config
index 49f10d8cd..4165d7cda 100644
--- a/debian/config/kernelarch-arm/config
+++ b/debian/config/kernelarch-arm/config
@@ -1,11 +1,15 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_SECCOMP=y
+
+##
 ## file: arch/arm/Kconfig
 ##
 CONFIG_MMU=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_CPU_SW_DOMAIN_PAN=y
-CONFIG_SECCOMP=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index 794bcf53b..7bd4666a1 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -1,4 +1,9 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_SECCOMP=y
+
+##
 ## file: arch/mips/Kconfig
 ##
 CONFIG_CPU_HAS_MSA=y
@@ -6,7 +11,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_RELOCATION_TABLE_SIZE=0x00180000
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_KEXEC=y
-CONFIG_SECCOMP=y
 CONFIG_MIPS_O32_FP64_SUPPORT=y
 #. Ignored in 32-bit configurations
 CONFIG_MIPS32_O32=y
diff --git a/debian/config/kernelarch-mips/config.boston b/debian/config/kernelarch-mips/config.boston
index 20178e150..d5a553a34 100644
--- a/debian/config/kernelarch-mips/config.boston
+++ b/debian/config/kernelarch-mips/config.boston
@@ -1,9 +1,6 @@
 ##
 ## file: arch/mips/Kconfig
 ##
-## choice: System type
-CONFIG_MIPS_GENERIC=y
-## end choice
 CONFIG_MIPS_CPS=y
 CONFIG_HIGHMEM=y
 CONFIG_NR_CPUS=16
@@ -70,3 +67,8 @@ CONFIG_SPI_TOPCLIFF_PCH=y
 ##
 CONFIG_SERIAL_OF_PLATFORM=y
 
+##
+## file: unknown
+##
+CONFIG_MIPS_GENERIC=y
+
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index dbd98f0b5..d4d9d543b 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -127,7 +127,7 @@ CONFIG_MTD_PHYSMAP=y
 CONFIG_OCTEON_MGMT_ETHERNET=y
 
 ##
-## file: drivers/net/phy/Kconfig
+## file: drivers/net/mdio/Kconfig
 ##
 CONFIG_MDIO_OCTEON=y
 
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index a8652ee1c..81308ffd7 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -1,11 +1,14 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_SECCOMP=y
+
+##
 ## file: arch/powerpc/Kconfig
 ##
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_KEXEC=y
-CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,9600 console=tty0"
-CONFIG_SECCOMP=y
 # CONFIG_ADVANCED_OPTIONS is not set
 
 ##
@@ -31,7 +34,6 @@ CONFIG_VIRTUALIZATION=y
 ##
 CONFIG_KVM_GUEST=y
 CONFIG_RTAS_PROC=y
-CONFIG_PPC601_SYNC_FIX=y
 CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 # CONFIG_TAU_AVERAGE is not set
@@ -910,3 +912,9 @@ CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 
+##
+## file: unknown
+##
+CONFIG_CMDLINE_BOOL=y
+CONFIG_PPC601_SYNC_FIX=y
+
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-le b/debian/config/kernelarch-powerpc/config-arch-64-le
index e26064cea..53ba08b80 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-le
+++ b/debian/config/kernelarch-powerpc/config-arch-64-le
@@ -1,9 +1,4 @@
 ##
-## file: arch/powerpc/Kconfig
-##
-# CONFIG_CMDLINE_BOOL is not set
-
-##
 ## file: arch/powerpc/platforms/Kconfig.cputype
 ##
 ## choice: Endianness selection
@@ -39,3 +34,8 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 #. See #789070
 # CONFIG_HIBERNATION is not set
 
+##
+## file: unknown
+##
+# CONFIG_CMDLINE_BOOL is not set
+
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index add8caf53..cda456a0c 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -1,8 +1,12 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_SECCOMP=y
+
+##
 ## file: arch/sparc/Kconfig
 ##
 CONFIG_64BIT=y
-CONFIG_SECCOMP=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_SUN_LDOMS=y
 CONFIG_SUN_OPENPROMFS=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 1f785b43a..0c675a56e 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -2,6 +2,7 @@
 ## file: arch/Kconfig
 ##
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_SECCOMP=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 
 ##
@@ -57,7 +58,6 @@ CONFIG_X86_SMAP=y
 CONFIG_X86_UMIP=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-CONFIG_SECCOMP=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 # CONFIG_KEXEC_JUMP is not set
@@ -166,7 +166,6 @@ CONFIG_CRYPTO_AES_NI_INTEL=m
 ##
 CONFIG_ACPI=y
 CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_AC=m
@@ -187,13 +186,6 @@ CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 CONFIG_ACPI_EXTLOG=y
-CONFIG_PMIC_OPREGION=y
-CONFIG_BYTCRC_PMIC_OPREGION=y
-CONFIG_CHTCRC_PMIC_OPREGION=y
-CONFIG_XPOWER_PMIC_OPREGION=y
-CONFIG_BXT_WC_PMIC_OPREGION=y
-CONFIG_CHT_WC_PMIC_OPREGION=y
-CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_X86_PM_TIMER=y
 
 ##
@@ -212,6 +204,17 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_DPTF_POWER=m
 
 ##
+## file: drivers/acpi/pmic/Kconfig
+##
+CONFIG_PMIC_OPREGION=y
+CONFIG_BYTCRC_PMIC_OPREGION=y
+CONFIG_CHTCRC_PMIC_OPREGION=y
+CONFIG_XPOWER_PMIC_OPREGION=y
+CONFIG_BXT_WC_PMIC_OPREGION=y
+CONFIG_CHT_WC_PMIC_OPREGION=y
+CONFIG_CHT_DC_TI_PMIC_OPREGION=y
+
+##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_PATA_ALI=m
@@ -825,12 +828,16 @@ CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 ##
 ## file: drivers/iommu/Kconfig
 ##
+CONFIG_IRQ_REMAP=y
+
+##
+## file: drivers/iommu/intel/Kconfig
+##
 CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_SVM=y
 ## choice: Default state of Intel DMA Remapping Devices
 CONFIG_INTEL_IOMMU_DEFAULT_ON_INTGPU_OFF=y
 ## end choice
-CONFIG_IRQ_REMAP=y
 
 ##
 ## file: drivers/isdn/Kconfig
@@ -2080,9 +2087,6 @@ CONFIG_SND_SOC_ES8316=m
 ## file: sound/soc/intel/Kconfig
 ##
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SOC_INTEL_HASWELL=m
-#. Cannot be enabled together with SND_SST_ATOM_HIFI2_PLATFORM_ACPI
-# CONFIG_SND_SOC_INTEL_BAYTRAIL is not set
 # CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set
 CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
 CONFIG_SND_SOC_INTEL_SKYLAKE=m
@@ -2144,3 +2148,11 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_X86=y
 CONFIG_HDMI_LPE_AUDIO=m
 
+##
+## file: unknown
+##
+# CONFIG_ACPI_PROCFS_POWER is not set
+#. Cannot be enabled together with SND_SST_ATOM_HIFI2_PLATFORM_ACPI
+# CONFIG_SND_SOC_INTEL_BAYTRAIL is not set
+CONFIG_SND_SOC_INTEL_HASWELL=m
+
diff --git a/debian/config/riscv64/config b/debian/config/riscv64/config
index 161385a7c..e5c2fcdbf 100644
--- a/debian/config/riscv64/config
+++ b/debian/config/riscv64/config
@@ -1,8 +1,12 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_SECCOMP=y
+
+##
 ## file: arch/riscv/Kconfig
 ##
 CONFIG_SMP=y
-CONFIG_SECCOMP=y
 
 ##
 ## file: arch/riscv/Kconfig.socs
diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index 0725a46dd..6ccf013d0 100644
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@@ -1,4 +1,9 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_SECCOMP=y
+
+##
 ## file: arch/s390/Kconfig
 ##
 ## choice: Processor type
@@ -19,7 +24,6 @@ CONFIG_PCI_NR_FUNCTIONS=64
 CONFIG_CHSC_SCH=m
 CONFIG_SCM_BUS=y
 CONFIG_EADM_SCH=m
-CONFIG_SECCOMP=y
 CONFIG_PFAULT=y
 CONFIG_CMM=y
 CONFIG_CMM_IUCV=y
@@ -31,11 +35,6 @@ CONFIG_S390_HYPFS_FS=y
 CONFIG_S390_GUEST=y
 
 ##
-## file: arch/s390/Kconfig.debug
-##
-# CONFIG_S390_PTDUMP is not set
-
-##
 ## file: arch/s390/kvm/Kconfig
 ##
 CONFIG_VIRTUALIZATION=y
@@ -219,3 +218,8 @@ CONFIG_AFIUCV=m
 ##
 # CONFIG_LLC2 is not set
 
+##
+## file: unknown
+##
+# CONFIG_S390_PTDUMP is not set
+
diff --git a/debian/config/sh4/config b/debian/config/sh4/config
index d46ec1d7b..650fc96fa 100644
--- a/debian/config/sh4/config
+++ b/debian/config/sh4/config
@@ -1,13 +1,13 @@
 ##
 ## file: arch/Kconfig
 ##
+CONFIG_SECCOMP=y
 # CONFIG_STACKPROTECTOR_STRONG is not set
 
 ##
 ## file: arch/sh/Kconfig
 ##
 CONFIG_KEXEC=y
-CONFIG_SECCOMP=y
 
 ##
 ## file: arch/sh/Kconfig.cpu
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index 02c32bf97..0ee3e3f31 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -95,33 +95,33 @@ CONFIG_INPUT_EVDEV=m
 ## file: drivers/input/keyboard/Kconfig
 ##
 CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=n
+# CONFIG_KEYBOARD_ATKBD is not set
 
 ##
 ## file: drivers/input/mouse/Kconfig
 ##
 CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=n
-CONFIG_MOUSE_PS2_ALPS=n
-CONFIG_MOUSE_PS2_BYD=n
-CONFIG_MOUSE_PS2_LOGIPS2PP=n
-CONFIG_MOUSE_PS2_SYNAPTICS=n
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=n
-CONFIG_MOUSE_PS2_CYPRESS=n
-CONFIG_MOUSE_PS2_LIFEBOOK=n
-CONFIG_MOUSE_PS2_TRACKPOINT=n
-CONFIG_MOUSE_PS2_ELANTECH=n
-CONFIG_MOUSE_PS2_ELANTECH_SMBUS=n
-CONFIG_MOUSE_PS2_SENTELIC=n
-CONFIG_MOUSE_PS2_FOCALTECH=n
+# CONFIG_MOUSE_PS2 is not set
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_BYD is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS is not set
+# CONFIG_MOUSE_PS2_CYPRESS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_ELANTECH_SMBUS is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_FOCALTECH is not set
 
 ##
 ## file: drivers/input/serio/Kconfig
 ##
-CONFIG_SERIO=n
-CONFIG_SERIO_I8042=n
-CONFIG_SERIO_SERPORT=n
-CONFIG_SERIO_LIBPS2=n
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_LIBPS2 is not set
 
 ##
 ## file: drivers/mfd/Kconfig
@@ -161,9 +161,9 @@ CONFIG_NETDEVICES=y
 CONFIG_R8169=m
 
 ##
-## file: drivers/net/parport/Kconfig
+## file: drivers/parport/Kconfig
 ##
-CONFIG_PARPORT_1284=n
+# CONFIG_PARPORT_1284 is not set
 
 ##
 ## file: drivers/pci/Kconfig