13 files changed, 221 insertions, 72 deletions
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 20188f12f0..283e2bea28 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -25,7 +25,7 @@ CONFIG_RANDOMIZE_MEMORY=y
 ## choice: vsyscall table for legacy applications
 CONFIG_LEGACY_VSYSCALL_NONE=y
 ## end choice
-CONFIG_SLS=y
+CONFIG_MITIGATION_SLS=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_ISA_DMA_API=y
 CONFIG_X86_X32_ABI=y
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 32edca497e..5013d65be4 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -219,15 +219,61 @@ CONFIG_TI_SCI_CLK=y
 ## file: drivers/clk/mediatek/Kconfig
 ##
 CONFIG_COMMON_CLK_MEDIATEK_FHCTL=y
-# CONFIG_COMMON_CLK_MT2712 is not set
-# CONFIG_COMMON_CLK_MT6765 is not set
-# CONFIG_COMMON_CLK_MT6779 is not set
-# CONFIG_COMMON_CLK_MT6795 is not set
-# CONFIG_COMMON_CLK_MT6797 is not set
-# CONFIG_COMMON_CLK_MT7622 is not set
-# CONFIG_COMMON_CLK_MT7981 is not set
-# CONFIG_COMMON_CLK_MT7986 is not set
-# CONFIG_COMMON_CLK_MT8167 is not set
+CONFIG_COMMON_CLK_MT2712=m
+CONFIG_COMMON_CLK_MT2712_BDPSYS=m
+CONFIG_COMMON_CLK_MT2712_IMGSYS=m
+CONFIG_COMMON_CLK_MT2712_JPGDECSYS=m
+CONFIG_COMMON_CLK_MT2712_MFGCFG=m
+CONFIG_COMMON_CLK_MT2712_MMSYS=m
+CONFIG_COMMON_CLK_MT2712_VDECSYS=m
+CONFIG_COMMON_CLK_MT2712_VENCSYS=m
+CONFIG_COMMON_CLK_MT6765=y
+CONFIG_COMMON_CLK_MT6765_AUDIOSYS=m
+CONFIG_COMMON_CLK_MT6765_CAMSYS=m
+CONFIG_COMMON_CLK_MT6765_GCESYS=m
+CONFIG_COMMON_CLK_MT6765_MMSYS=m
+CONFIG_COMMON_CLK_MT6765_IMGSYS=m
+CONFIG_COMMON_CLK_MT6765_VCODECSYS=m
+CONFIG_COMMON_CLK_MT6765_MFGSYS=m
+CONFIG_COMMON_CLK_MT6765_MIPI0ASYS=m
+CONFIG_COMMON_CLK_MT6765_MIPI0BSYS=m
+CONFIG_COMMON_CLK_MT6765_MIPI1ASYS=m
+CONFIG_COMMON_CLK_MT6765_MIPI1BSYS=m
+CONFIG_COMMON_CLK_MT6765_MIPI2ASYS=m
+CONFIG_COMMON_CLK_MT6765_MIPI2BSYS=m
+CONFIG_COMMON_CLK_MT6779=m
+CONFIG_COMMON_CLK_MT6779_MMSYS=m
+CONFIG_COMMON_CLK_MT6779_IMGSYS=m
+CONFIG_COMMON_CLK_MT6779_IPESYS=m
+CONFIG_COMMON_CLK_MT6779_CAMSYS=m
+CONFIG_COMMON_CLK_MT6779_VDECSYS=m
+CONFIG_COMMON_CLK_MT6779_VENCSYS=m
+CONFIG_COMMON_CLK_MT6779_MFGCFG=m
+CONFIG_COMMON_CLK_MT6779_AUDSYS=m
+CONFIG_COMMON_CLK_MT6795=m
+CONFIG_COMMON_CLK_MT6795_MFGCFG=m
+CONFIG_COMMON_CLK_MT6795_MMSYS=m
+CONFIG_COMMON_CLK_MT6795_VDECSYS=m
+CONFIG_COMMON_CLK_MT6795_VENCSYS=m
+CONFIG_COMMON_CLK_MT6797=y
+CONFIG_COMMON_CLK_MT6797_MMSYS=m
+CONFIG_COMMON_CLK_MT6797_IMGSYS=m
+CONFIG_COMMON_CLK_MT6797_VDECSYS=m
+CONFIG_COMMON_CLK_MT6797_VENCSYS=m
+CONFIG_COMMON_CLK_MT7622=m
+CONFIG_COMMON_CLK_MT7622_ETHSYS=m
+CONFIG_COMMON_CLK_MT7622_HIFSYS=m
+CONFIG_COMMON_CLK_MT7622_AUDSYS=m
+CONFIG_COMMON_CLK_MT7981=y
+CONFIG_COMMON_CLK_MT7981_ETHSYS=m
+CONFIG_COMMON_CLK_MT7986=m
+CONFIG_COMMON_CLK_MT7986_ETHSYS=m
+CONFIG_COMMON_CLK_MT8167=m
+CONFIG_COMMON_CLK_MT8167_AUDSYS=m
+CONFIG_COMMON_CLK_MT8167_IMGSYS=m
+CONFIG_COMMON_CLK_MT8167_MFGCFG=m
+CONFIG_COMMON_CLK_MT8167_MMSYS=m
+CONFIG_COMMON_CLK_MT8167_VDECSYS=m
 CONFIG_COMMON_CLK_MT8173=m
 CONFIG_COMMON_CLK_MT8173_IMGSYS=m
 CONFIG_COMMON_CLK_MT8173_MMSYS=m
@@ -245,9 +291,43 @@ CONFIG_COMMON_CLK_MT8183_MFGCFG=m
 CONFIG_COMMON_CLK_MT8183_MMSYS=m
 CONFIG_COMMON_CLK_MT8183_VDECSYS=m
 CONFIG_COMMON_CLK_MT8183_VENCSYS=m
-# CONFIG_COMMON_CLK_MT8186 is not set
-# CONFIG_COMMON_CLK_MT8188 is not set
-# CONFIG_COMMON_CLK_MT8192 is not set
+CONFIG_COMMON_CLK_MT8186=m
+CONFIG_COMMON_CLK_MT8186_CAMSYS=m
+CONFIG_COMMON_CLK_MT8186_IMGSYS=m
+CONFIG_COMMON_CLK_MT8186_IPESYS=m
+CONFIG_COMMON_CLK_MT8186_WPESYS=m
+CONFIG_COMMON_CLK_MT8186_IMP_IIC_WRAP=m
+CONFIG_COMMON_CLK_MT8186_MCUSYS=m
+CONFIG_COMMON_CLK_MT8186_MDPSYS=m
+CONFIG_COMMON_CLK_MT8186_MFGCFG=m
+CONFIG_COMMON_CLK_MT8186_MMSYS=m
+CONFIG_COMMON_CLK_MT8186_VDECSYS=m
+CONFIG_COMMON_CLK_MT8186_VENCSYS=m
+CONFIG_COMMON_CLK_MT8188=m
+CONFIG_COMMON_CLK_MT8188_ADSP_AUDIO26M=m
+CONFIG_COMMON_CLK_MT8188_CAMSYS=m
+CONFIG_COMMON_CLK_MT8188_IMGSYS=m
+CONFIG_COMMON_CLK_MT8188_IMP_IIC_WRAP=m
+CONFIG_COMMON_CLK_MT8188_IPESYS=m
+CONFIG_COMMON_CLK_MT8188_MFGCFG=m
+CONFIG_COMMON_CLK_MT8188_VDECSYS=m
+CONFIG_COMMON_CLK_MT8188_VDOSYS=m
+CONFIG_COMMON_CLK_MT8188_VENCSYS=m
+CONFIG_COMMON_CLK_MT8188_VPPSYS=m
+CONFIG_COMMON_CLK_MT8188_WPESYS=m
+CONFIG_COMMON_CLK_MT8192=m
+CONFIG_COMMON_CLK_MT8192_AUDSYS=m
+CONFIG_COMMON_CLK_MT8192_CAMSYS=m
+CONFIG_COMMON_CLK_MT8192_IMGSYS=m
+CONFIG_COMMON_CLK_MT8192_IMP_IIC_WRAP=m
+CONFIG_COMMON_CLK_MT8192_IPESYS=m
+CONFIG_COMMON_CLK_MT8192_MDPSYS=m
+CONFIG_COMMON_CLK_MT8192_MFGCFG=m
+CONFIG_COMMON_CLK_MT8192_MMSYS=m
+CONFIG_COMMON_CLK_MT8192_MSDC=m
+CONFIG_COMMON_CLK_MT8192_SCP_ADSP=m
+CONFIG_COMMON_CLK_MT8192_VDECSYS=m
+CONFIG_COMMON_CLK_MT8192_VENCSYS=m
 CONFIG_COMMON_CLK_MT8195=y
 CONFIG_COMMON_CLK_MT8195_APUSYS=m
 CONFIG_COMMON_CLK_MT8195_AUDSYS=m
@@ -259,11 +339,19 @@ CONFIG_COMMON_CLK_MT8195_VDOSYS=m
 CONFIG_COMMON_CLK_MT8195_VPPSYS=m
 CONFIG_COMMON_CLK_MT8195_CAMSYS=m
 CONFIG_COMMON_CLK_MT8195_IMGSYS=m
+CONFIG_COMMON_CLK_MT8195_IPESYS=m
 CONFIG_COMMON_CLK_MT8195_WPESYS=m
 CONFIG_COMMON_CLK_MT8195_VDECSYS=m
 CONFIG_COMMON_CLK_MT8195_VENCSYS=m
-# CONFIG_COMMON_CLK_MT8365 is not set
-# CONFIG_COMMON_CLK_MT8516 is not set
+CONFIG_COMMON_CLK_MT8365=m
+CONFIG_COMMON_CLK_MT8365_APU=m
+CONFIG_COMMON_CLK_MT8365_CAM=m
+CONFIG_COMMON_CLK_MT8365_MFG=m
+CONFIG_COMMON_CLK_MT8365_MMSYS=m
+CONFIG_COMMON_CLK_MT8365_VDEC=m
+CONFIG_COMMON_CLK_MT8365_VENC=m
+CONFIG_COMMON_CLK_MT8516=m
+CONFIG_COMMON_CLK_MT8516_AUDSYS=m
 
 ##
 ## file: drivers/clk/qcom/Kconfig
@@ -320,11 +408,11 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=m
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_QORIQ_CPUFREQ=m
+CONFIG_ACPI_CPPC_CPUFREQ=m
 
 ##
 ## file: drivers/cpufreq/Kconfig.arm
 ##
-CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
 CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
 CONFIG_ARM_SCPI_CPUFREQ=m
@@ -605,14 +693,14 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 ## file: drivers/gpu/drm/panel/Kconfig
 ##
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
-CONFIG_DRM_PANEL_LVDS=m
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_EDP=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
+CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_SITRONIX_ST7703=m
+CONFIG_DRM_PANEL_EDP=m
+CONFIG_DRM_PANEL_SIMPLE=m
 
 ##
 ## file: drivers/gpu/drm/panfrost/Kconfig
@@ -876,6 +964,8 @@ CONFIG_LEDS_PWM=m
 ##
 ## file: drivers/leds/rgb/Kconfig
 ##
+CONFIG_LEDS_GROUP_MULTICOLOR=m
+CONFIG_LEDS_PWM_MULTICOLOR=m
 CONFIG_LEDS_QCOM_LPG=m
 
 ##
@@ -1274,6 +1364,7 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MEDIATEK=m
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
 
@@ -1312,6 +1403,11 @@ CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_MOTORCOMM_PHY=m
+CONFIG_REALTEK_PHY=m
+
+##
+## file: drivers/net/phy/qcom/Kconfig
+##
 CONFIG_AT803X_PHY=m
 
 ##
@@ -1588,24 +1684,24 @@ CONFIG_PINCTRL_IMX8MQ=y
 ## file: drivers/pinctrl/mediatek/Kconfig
 ##
 CONFIG_EINT_MTK=y
-# CONFIG_PINCTRL_MT2712 is not set
-# CONFIG_PINCTRL_MT6765 is not set
-# CONFIG_PINCTRL_MT6779 is not set
-# CONFIG_PINCTRL_MT6795 is not set
-# CONFIG_PINCTRL_MT6797 is not set
-# CONFIG_PINCTRL_MT7622 is not set
-# CONFIG_PINCTRL_MT7981 is not set
-# CONFIG_PINCTRL_MT7986 is not set
-# CONFIG_PINCTRL_MT8167 is not set
+CONFIG_PINCTRL_MT2712=y
+CONFIG_PINCTRL_MT6765=y
+CONFIG_PINCTRL_MT6779=y
+CONFIG_PINCTRL_MT6795=y
+CONFIG_PINCTRL_MT6797=y
+CONFIG_PINCTRL_MT7622=y
+CONFIG_PINCTRL_MT7981=y
+CONFIG_PINCTRL_MT7986=y
+CONFIG_PINCTRL_MT8167=y
 CONFIG_PINCTRL_MT8173=y
 CONFIG_PINCTRL_MT8183=y
-# CONFIG_PINCTRL_MT8186 is not set
-# CONFIG_PINCTRL_MT8188 is not set
-# CONFIG_PINCTRL_MT8192 is not set
+CONFIG_PINCTRL_MT8186=y
+CONFIG_PINCTRL_MT8188=y
+CONFIG_PINCTRL_MT8192=y
 CONFIG_PINCTRL_MT8195=y
-# CONFIG_PINCTRL_MT8365 is not set
-# CONFIG_PINCTRL_MT8516 is not set
-# CONFIG_PINCTRL_MT6397 is not set
+CONFIG_PINCTRL_MT8365=y
+CONFIG_PINCTRL_MT8516=y
+CONFIG_PINCTRL_MT6397=y
 
 ##
 ## file: drivers/pinctrl/qcom/Kconfig
@@ -1686,12 +1782,18 @@ CONFIG_BATTERY_AXP20X=m
 CONFIG_AXP20X_POWER=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MT6360=m
 CONFIG_CHARGER_QCOM_SMBB=m
 CONFIG_CHARGER_BQ25890=m
 CONFIG_CHARGER_RK817=m
 CONFIG_CHARGER_CROS_USBPD=m
 
 ##
+## file: drivers/pps/clients/Kconfig
+##
+CONFIG_PPS_CLIENT_GPIO=m
+
+##
 ## file: drivers/ptp/Kconfig
 ##
 CONFIG_PTP_1588_CLOCK_QORIQ=m
@@ -1727,8 +1829,10 @@ CONFIG_REGULATOR_HI655X=m
 CONFIG_REGULATOR_MAX77620=m
 CONFIG_REGULATOR_MP8859=m
 CONFIG_REGULATOR_MT6315=m
+CONFIG_REGULATOR_MT6357=m
 CONFIG_REGULATOR_MT6358=m
 CONFIG_REGULATOR_MT6359=m
+CONFIG_REGULATOR_MT6360=m
 CONFIG_REGULATOR_MT6397=m
 CONFIG_REGULATOR_PCA9450=m
 CONFIG_REGULATOR_PFUZE100=m
@@ -1823,6 +1927,7 @@ CONFIG_FSL_RCPM=y
 ## file: drivers/soc/mediatek/Kconfig
 ##
 CONFIG_MTK_CMDQ=m
+CONFIG_MTK_DEVAPC=m
 CONFIG_MTK_INFRACFG=y
 CONFIG_MTK_PMIC_WRAP=m
 CONFIG_MTK_REGULATOR_COUPLER=y
@@ -2137,6 +2242,7 @@ CONFIG_TYPEC_MUX_GPIO_SBU=m
 ##
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_MT6360=m
 CONFIG_TYPEC_FUSB302=m
 
 ##
diff --git a/debian/config/arm64/config.cloud-arm64 b/debian/config/arm64/config.cloud-arm64
index 9117b3b6f6..d1193465da 100644
--- a/debian/config/arm64/config.cloud-arm64
+++ b/debian/config/arm64/config.cloud-arm64
@@ -81,7 +81,7 @@ CONFIG_VEXPRESS_CONFIG=y
 # CONFIG_CLK_QORIQ is not set
 
 ##
-## file: drivers/cpufreq/Kconfig.arm
+## file: drivers/cpufreq/Kconfig
 ##
 CONFIG_ACPI_CPPC_CPUFREQ=m
 
diff --git a/debian/config/armel/config.rpi b/debian/config/armel/config.rpi
index 830d29c412..97ea44bf39 100644
--- a/debian/config/armel/config.rpi
+++ b/debian/config/armel/config.rpi
@@ -116,6 +116,11 @@ CONFIG_NVMEM_RMEM=m
 CONFIG_RASPBERRYPI_POWER=y
 
 ##
+## file: drivers/pps/clients/Kconfig
+##
+CONFIG_PPS_CLIENT_GPIO=m
+
+##
 ## file: drivers/pwm/Kconfig
 ##
 CONFIG_PWM=y
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 5c5d68944b..c6f7832055 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -468,12 +468,12 @@ CONFIG_OMAP2_DSS_DSI=y
 ##
 ## file: drivers/gpu/drm/panel/Kconfig
 ##
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_EDP=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+CONFIG_DRM_PANEL_EDP=m
+CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
 
@@ -1270,6 +1270,11 @@ CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24735=m
 
 ##
+## file: drivers/pps/clients/Kconfig
+##
+CONFIG_PPS_CLIENT_GPIO=m
+
+##
 ## file: drivers/pwm/Kconfig
 ##
 CONFIG_PWM=y
diff --git a/debian/config/config b/debian/config/config
index 692a542bac..b45b088c84 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -712,7 +712,6 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_VGEM=m
-# CONFIG_DRM_VKMS is not set
 
 ##
 ## file: drivers/gpu/drm/amd/acp/Kconfig
@@ -808,9 +807,9 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 ##
 ## file: drivers/gpu/drm/panel/Kconfig
 ##
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 
@@ -841,6 +840,11 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_VIRTIO_GPU=m
 
 ##
+## file: drivers/gpu/drm/vkms/Kconfig
+##
+# CONFIG_DRM_VKMS is not set
+
+##
 ## file: drivers/gpu/drm/vmwgfx/Kconfig
 ##
 # CONFIG_DRM_VMWGFX is not set
@@ -2997,7 +3001,6 @@ CONFIG_MTD_LPDDR=m
 # CONFIG_MTD_CK804XROM is not set
 CONFIG_MTD_PCMCIA=m
 # CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
 
 ##
@@ -3768,7 +3771,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
-CONFIG_AT803X_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_RENESAS_PHY=m
@@ -3791,6 +3793,11 @@ CONFIG_VITESSE_PHY=m
 CONFIG_AQUANTIA_PHY=m
 
 ##
+## file: drivers/net/phy/qcom/Kconfig
+##
+CONFIG_AT803X_PHY=m
+
+##
 ## file: drivers/net/ppp/Kconfig
 ##
 CONFIG_PPP=m
@@ -4947,11 +4954,6 @@ CONFIG_SSB_PCMCIAHOST=y
 CONFIG_STAGING=y
 
 ##
-## file: drivers/staging/board/Kconfig
-##
-# CONFIG_STAGING_BOARD is not set
-
-##
 ## file: drivers/staging/fbtft/Kconfig
 ##
 # CONFIG_FB_TFT is not set
@@ -6101,11 +6103,6 @@ CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_INOTIFY_USER=y
 
 ##
-## file: fs/ntfs/Kconfig
-##
-# CONFIG_NTFS_FS is not set
-
-##
 ## file: fs/ocfs2/Kconfig
 ##
 CONFIG_OCFS2_FS=m
@@ -6625,7 +6622,7 @@ CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 #. Self-test
 # CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_STRING_HELPERS_KUNIT_TEST is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
@@ -7074,7 +7071,6 @@ CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 
@@ -7530,7 +7526,6 @@ CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
diff --git a/debian/config/kernelarch-arm/config b/debian/config/kernelarch-arm/config
index 5edd118c45..46b730926e 100644
--- a/debian/config/kernelarch-arm/config
+++ b/debian/config/kernelarch-arm/config
@@ -14,7 +14,6 @@ CONFIG_CPU_SW_DOMAIN_PAN=y
 ##
 ## file: arch/arm/Kconfig.debug
 ##
-CONFIG_DEBUG_WX=y
 CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
 
@@ -159,3 +158,8 @@ CONFIG_CRASH_DUMP=y
 ##
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
+
+##
+## file: mm/Kconfig.debug
+##
+CONFIG_DEBUG_WX=y
diff --git a/debian/config/kernelarch-mips/config.malta b/debian/config/kernelarch-mips/config.malta
index e6fe1a8b14..e5cf6bf01f 100644
--- a/debian/config/kernelarch-mips/config.malta
+++ b/debian/config/kernelarch-mips/config.malta
@@ -1,12 +1,16 @@
 ##
+## file: arch/Kconfig
+##
+## choice: MMU page size
+CONFIG_PAGE_SIZE_4KB=y
+## end choice
+
+##
 ## file: arch/mips/Kconfig
 ##
 ## choice: System type
 CONFIG_MIPS_MALTA=y
 ## end choice
-## choice: Kernel page size
-CONFIG_PAGE_SIZE_4KB=y
-## end choice
 
 ##
 ## file: drivers/ata/Kconfig
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index 97e4e6ac43..898d80842f 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -15,6 +15,8 @@ CONFIG_KERNEL_START=0xc000000000000000
 ## file: arch/powerpc/crypto/Kconfig
 ##
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
+CONFIG_CRYPTO_DEV_VMX=y
+CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 
 ##
 ## file: arch/powerpc/kvm/Kconfig
@@ -76,7 +78,6 @@ CONFIG_HW_RANDOM_POWERNV=m
 ## file: drivers/crypto/Kconfig
 ##
 CONFIG_CRYPTO_DEV_NX=y
-CONFIG_CRYPTO_DEV_VMX=y
 
 ##
 ## file: drivers/crypto/nx/Kconfig
@@ -87,11 +88,6 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 
 ##
-## file: drivers/crypto/vmx/Kconfig
-##
-CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
-
-##
 ## file: drivers/gpu/drm/amd/amdgpu/Kconfig
 ##
 CONFIG_DRM_AMDGPU=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 3431fc11e7..d77140dbd7 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -57,7 +57,7 @@ CONFIG_RANDOMIZE_BASE=y
 # CONFIG_COMPAT_VDSO is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_RETPOLINE=y
+CONFIG_MITIGATION_RETPOLINE=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 # CONFIG_ISA_BUS is not set
 CONFIG_IA32_EMULATION=y
@@ -172,7 +172,6 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
-# CONFIG_ACPI_CUSTOM_METHOD is not set
 CONFIG_ACPI_EXTLOG=y
 CONFIG_X86_PM_TIMER=y
 
@@ -1403,6 +1402,8 @@ CONFIG_PINCTRL_ICELAKE=y
 CONFIG_PINCTRL_JASPERLAKE=m
 CONFIG_PINCTRL_LAKEFIELD=m
 CONFIG_PINCTRL_LEWISBURG=y
+CONFIG_PINCTRL_METEORLAKE=m
+CONFIG_PINCTRL_METEORPOINT=m
 CONFIG_PINCTRL_SUNRISEPOINT=y
 CONFIG_PINCTRL_TIGERLAKE=y
 
diff --git a/debian/config/riscv64/config b/debian/config/riscv64/config
index eb2f476b70..6f5e6e7919 100644
--- a/debian/config/riscv64/config
+++ b/debian/config/riscv64/config
@@ -40,6 +40,11 @@ CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_DWC=m
 
 ##
+## file: drivers/cache/Kconfig
+##
+CONFIG_SIFIVE_CCACHE=y
+
+##
 ## file: drivers/char/hw_random/Kconfig
 ##
 CONFIG_HW_RANDOM_POLARFIRE_SOC=m
@@ -124,6 +129,7 @@ CONFIG_LEDS_PWM=m
 ##
 ## file: drivers/leds/rgb/Kconfig
 ##
+CONFIG_LEDS_GROUP_MULTICOLOR=m
 CONFIG_LEDS_PWM_MULTICOLOR=m
 
 ##
@@ -213,6 +219,11 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_RESTART=y
 
 ##
+## file: drivers/pps/clients/Kconfig
+##
+CONFIG_PPS_CLIENT_GPIO=m
+
+##
 ## file: drivers/pwm/Kconfig
 ##
 CONFIG_PWM=y
@@ -273,6 +284,20 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_USB=m
 
 ##
+## file: drivers/usb/cdns3/Kconfig
+##
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_CDNS3_STARFIVE=m
+
+##
+## file: drivers/usb/gadget/Kconfig
+##
+CONFIG_USB_GADGET=m
+
+##
 ## file: drivers/usb/host/Kconfig
 ##
 CONFIG_USB_XHCI_PLATFORM=m
diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r
index 03b23a8a7b..b1231104a5 100644
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@@ -1,4 +1,11 @@
 ##
+## file: arch/Kconfig
+##
+## choice: MMU page size
+CONFIG_PAGE_SIZE_4KB=y
+## end choice
+
+##
 ## file: arch/sh/Kconfig
 ##
 ## choice: Processor sub-type selection
@@ -31,9 +38,6 @@ CONFIG_MMU=y
 CONFIG_MEMORY_START=0x0c000000
 CONFIG_MEMORY_SIZE=0x04000000
 CONFIG_VSYSCALL=y
-## choice: Kernel page size
-CONFIG_PAGE_SIZE_4KB=y
-## end choice
 
 ##
 ## file: drivers/ata/Kconfig
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index ee3e63de17..4e4260b5b3 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -1,4 +1,11 @@
 ##
+## file: arch/Kconfig
+##
+## choice: MMU page size
+CONFIG_PAGE_SIZE_4KB=y
+## end choice
+
+##
 ## file: arch/sh/Kconfig
 ##
 ## choice: Processor sub-type selection
@@ -27,9 +34,6 @@ CONFIG_MMU=y
 CONFIG_MEMORY_START=0x48000000
 CONFIG_MEMORY_SIZE=0x18000000
 CONFIG_VSYSCALL=y
-## choice: Kernel page size
-CONFIG_PAGE_SIZE_4KB=y
-## end choice
 ## choice: HugeTLB page size
 CONFIG_HUGETLB_PAGE_SIZE_64K=y
 ## end choice