diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 6eb6db77d..dce3c8c72 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -328,7 +328,7 @@ CONFIG_ATA_PIIX=y
 CONFIG_ATA_SFF=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA=y
-# CONFIG_ATH10K_AHB is not set
+CONFIG_ATH10K_AHB=y
 CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K=m
@@ -880,7 +880,6 @@ CONFIG_CHARGER_MAX77650=m
 CONFIG_CHARGER_MAX77976=m
 # CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_MT6370=m
-# CONFIG_CHARGER_QCOM_SMB2 is not set
 # CONFIG_CHARGER_RT9455 is not set
 CONFIG_CHARGER_RT9467=m
 CONFIG_CHARGER_RT9471=m
@@ -929,7 +928,6 @@ CONFIG_CIO2_BRIDGE=y
 CONFIG_CLEANCACHE=y
 CONFIG_CLK_FD_KUNIT_TEST=m
 CONFIG_CLK_GATE_KUNIT_TEST=m
-# CONFIG_CLK_GFM_LPASS_SM8250 is not set
 # CONFIG_CLK_ICST is not set
 CONFIG_CLK_KUNIT_TEST=m
 # CONFIG_CLK_QORIQ is not set
@@ -1135,7 +1133,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
@@ -1779,9 +1776,11 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
+CONFIG_DWMAC_DWC_QOS_ETH=m
+CONFIG_DWMAC_GENERIC=m
 # CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
-CONFIG_DWMAC_STARFIVE=y
+CONFIG_DWMAC_STARFIVE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DW_XDATA_PCIE=m
 CONFIG_DYNAMIC_DEBUG=y
@@ -3279,7 +3278,6 @@ CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA995X=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_PWM_MULTICOLOR=m
-CONFIG_LEDS_QCOM_FLASH=m
 CONFIG_LEDS_REGULATOR=m
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
@@ -5087,7 +5085,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_EMAC is not set
@@ -6143,10 +6140,8 @@ CONFIG_SLUB_KUNIT_TEST=m
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
 # CONFIG_SMB_SERVER is not set
-# CONFIG_SM_CAMCC_8250 is not set
 CONFIG_SMC_DIAG=m
 CONFIG_SMC=m
-# CONFIG_SM_DISPCC_8250 is not set
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
@@ -6159,7 +6154,6 @@ CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 CONFIG_SMS_USB_DRV=m
 # CONFIG_SM_VIDEOCC_8150 is not set
-# CONFIG_SM_VIDEOCC_8250 is not set
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_AC97_POWER_SAVE=y
 # CONFIG_SND_AD1889 is not set
@@ -6937,10 +6931,10 @@ CONFIG_STEAM_FF=y
 CONFIG_STK3310=m
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
-# CONFIG_STM is not set
+CONFIG_STM=m
 CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_PCI is not set
-# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PLATFORM=m
 # CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STRCAT_KUNIT_TEST=m
 CONFIG_STRICT_DEVMEM=y
@@ -7123,6 +7117,7 @@ CONFIG_TEST_SORT=m
 CONFIG_TEST_STRING_HELPERS=m
 # CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UBSAN is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_UUID is not set
@@ -7385,7 +7380,16 @@ CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
 CONFIG_UBIFS_FS_XATTR=y
-# CONFIG_UBSAN is not set
+# CONFIG_UBSAN_ALIGNMENT is not set
+CONFIG_UBSAN_BOOL=y
+CONFIG_UBSAN_BOUNDS=y
+# CONFIG_UBSAN_DIV_ZERO is not set
+CONFIG_UBSAN_ENUM=y
+CONFIG_UBSAN_SANITIZE_ALL=y
+CONFIG_UBSAN_SHIFT=y
+# CONFIG_UBSAN_TRAP is not set
+# CONFIG_UBSAN_UNREACHABLE is not set
+CONFIG_UBSAN=y
 CONFIG_UCLAMP_BUCKETS_COUNT=5
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_UCLAMP_TASK=y
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index a393a45e4..a2d9692e7 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -326,7 +326,7 @@ CONFIG_ATA_PIIX=y
 CONFIG_ATA_SFF=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA=y
-# CONFIG_ATH10K_AHB is not set
+CONFIG_ATH10K_AHB=y
 CONFIG_ATH10K_DEBUGFS=y
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K=m
@@ -878,7 +878,6 @@ CONFIG_CHARGER_MAX77650=m
 CONFIG_CHARGER_MAX77976=m
 # CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_MT6370=m
-# CONFIG_CHARGER_QCOM_SMB2 is not set
 # CONFIG_CHARGER_RT9455 is not set
 CONFIG_CHARGER_RT9467=m
 CONFIG_CHARGER_RT9471=m
@@ -927,7 +926,6 @@ CONFIG_CIO2_BRIDGE=y
 CONFIG_CLEANCACHE=y
 CONFIG_CLK_FD_KUNIT_TEST=m
 CONFIG_CLK_GATE_KUNIT_TEST=m
-# CONFIG_CLK_GFM_LPASS_SM8250 is not set
 # CONFIG_CLK_ICST is not set
 CONFIG_CLK_KUNIT_TEST=m
 # CONFIG_CLK_QORIQ is not set
@@ -1133,7 +1131,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
@@ -1768,9 +1765,11 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
+CONFIG_DWMAC_DWC_QOS_ETH=m
+CONFIG_DWMAC_GENERIC=m
 # CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
-CONFIG_DWMAC_STARFIVE=y
+CONFIG_DWMAC_STARFIVE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DW_XDATA_PCIE=m
 CONFIG_DYNAMIC_DEBUG=y
@@ -3253,7 +3252,6 @@ CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA995X=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_PWM_MULTICOLOR=m
-CONFIG_LEDS_QCOM_FLASH=m
 CONFIG_LEDS_REGULATOR=m
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
@@ -5058,7 +5056,6 @@ CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
-# CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_EMAC is not set
@@ -6114,10 +6111,8 @@ CONFIG_SLUB_KUNIT_TEST=m
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
 # CONFIG_SMB_SERVER is not set
-# CONFIG_SM_CAMCC_8250 is not set
 CONFIG_SMC_DIAG=m
 CONFIG_SMC=m
-# CONFIG_SM_DISPCC_8250 is not set
 # CONFIG_SM_FTL is not set
 CONFIG_SMP=y
 CONFIG_SMSC911X=m
@@ -6130,7 +6125,6 @@ CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 CONFIG_SMS_USB_DRV=m
 # CONFIG_SM_VIDEOCC_8150 is not set
-# CONFIG_SM_VIDEOCC_8250 is not set
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_AC97_POWER_SAVE=y
 # CONFIG_SND_AD1889 is not set
@@ -6906,10 +6900,10 @@ CONFIG_STEAM_FF=y
 CONFIG_STK3310=m
 # CONFIG_STK8312 is not set
 # CONFIG_STK8BA50 is not set
-# CONFIG_STM is not set
+CONFIG_STM=m
 CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_PCI is not set
-# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PLATFORM=m
 # CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STRCAT_KUNIT_TEST=m
 CONFIG_STRICT_DEVMEM=y
@@ -7092,6 +7086,7 @@ CONFIG_TEST_SORT=m
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UBSAN is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_UUID is not set
@@ -7354,7 +7349,16 @@ CONFIG_UBIFS_FS_AUTHENTICATION=y
 CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_SECURITY=y
 CONFIG_UBIFS_FS_XATTR=y
-# CONFIG_UBSAN is not set
+# CONFIG_UBSAN_ALIGNMENT is not set
+CONFIG_UBSAN_BOOL=y
+CONFIG_UBSAN_BOUNDS=y
+# CONFIG_UBSAN_DIV_ZERO is not set
+CONFIG_UBSAN_ENUM=y
+CONFIG_UBSAN_SANITIZE_ALL=y
+CONFIG_UBSAN_SHIFT=y
+# CONFIG_UBSAN_TRAP is not set
+# CONFIG_UBSAN_UNREACHABLE is not set
+CONFIG_UBSAN=y
 CONFIG_UCLAMP_BUCKETS_COUNT=5
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_UCLAMP_TASK=y