diff --git a/Makefile.rhelver b/Makefile.rhelver
index 3606a7785..cb2beaa85 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 12
+RHEL_RELEASE = 17
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index 6a62260dc..e65674c91 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -440,6 +440,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -1700,7 +1702,7 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CSD_LOCK_WAIT_DEBUG_DEFAULT is not set
 CONFIG_CSD_LOCK_WAIT_DEBUG=y
-# CONFIG_CUSE is not set
+CONFIG_CUSE=m
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
@@ -3582,8 +3584,8 @@ CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_DMA=y
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 CONFIG_IOMMU_IO_PGTABLE_DART=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -6846,6 +6848,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S35390A=m
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index cecb10501..217c970be 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -440,6 +440,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -1700,7 +1702,7 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CSD_LOCK_WAIT_DEBUG_DEFAULT is not set
 # CONFIG_CSD_LOCK_WAIT_DEBUG is not set
-# CONFIG_CUSE is not set
+CONFIG_CUSE=m
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
@@ -6819,6 +6821,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S35390A=m
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index ead7e2f01..2699e14cf 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -347,6 +347,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -2953,8 +2955,8 @@ CONFIG_IOMMU_DEBUGFS=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_DART is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -5514,6 +5516,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 4e1e4fcf0..4500a8913 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -347,6 +347,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -5491,6 +5493,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 504e4cf5a..68b74ed46 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -440,6 +440,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -1700,7 +1702,7 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CSD_LOCK_WAIT_DEBUG_DEFAULT is not set
 CONFIG_CSD_LOCK_WAIT_DEBUG=y
-# CONFIG_CUSE is not set
+CONFIG_CUSE=m
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
@@ -3582,8 +3584,8 @@ CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_DMA=y
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 CONFIG_IOMMU_IO_PGTABLE_DART=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -6845,6 +6847,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S35390A=m
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 4fb67545b..9352ae297 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -347,6 +347,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -2950,8 +2952,8 @@ CONFIG_IOMMU_DEBUGFS=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_DART is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -5510,6 +5512,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 1665f0889..9289ee153 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -440,6 +440,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -1700,7 +1702,7 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CSD_LOCK_WAIT_DEBUG_DEFAULT is not set
 # CONFIG_CSD_LOCK_WAIT_DEBUG is not set
-# CONFIG_CUSE is not set
+CONFIG_CUSE=m
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
@@ -6818,6 +6820,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S35390A=m
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 3939dd3e6..28b3f9dab 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -347,6 +347,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -5487,6 +5489,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 10f1d16b6..5fd18067a 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -347,6 +347,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -2990,8 +2992,8 @@ CONFIG_IOMMU_DEBUGFS=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_DART is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -5562,6 +5564,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 5679a8cf9..f0dfe47a5 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -347,6 +347,8 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_ERRATUM_2658417=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_826319=y
@@ -5539,6 +5541,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 8758ccc37..c69fcf94b 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -303,6 +303,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -2851,8 +2853,8 @@ CONFIG_IOMMU_DEBUGFS=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IONIC=m
 CONFIG_IOSCHED_BFQ=y
@@ -5562,6 +5564,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index ea6c87341..5a8a7f159 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -278,6 +278,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -2634,8 +2636,8 @@ CONFIG_IOMMU_DEBUGFS=y
 # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_DART is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -5057,6 +5059,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 38b33d202..017b55e7e 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -303,6 +303,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -5533,6 +5535,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index ffb102d86..1788a7239 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -278,6 +278,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -5036,6 +5038,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 2c4aebdd1..3f4db0cda 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -306,6 +306,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -2821,8 +2823,8 @@ CONFIG_IOMMU_DEBUGFS=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IONIC=m
 CONFIG_IOSCHED_BFQ=y
@@ -5479,6 +5481,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 18d552de5..be63f1bbe 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -277,6 +277,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -2617,8 +2619,8 @@ CONFIG_IOMMU_DEBUGFS=y
 # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_DART is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -4990,6 +4992,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index d992fb30f..11f80fa1f 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -306,6 +306,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -5450,6 +5452,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 7d5060984..198fd1fd5 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -277,6 +277,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -4969,6 +4971,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 4fac6424e..b19ea8141 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -277,6 +277,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -4981,6 +4983,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 12dab80cb..9941e1f13 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -344,6 +344,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -3191,8 +3193,8 @@ CONFIG_IOMMU_DEBUGFS=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IONIC=m
 CONFIG_IOSCHED_BFQ=y
@@ -5998,6 +6000,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 98740dad4..d614de8f1 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -302,6 +302,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -2832,8 +2834,8 @@ CONFIG_IOMMU_DEBUGFS=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_DART is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -5279,6 +5281,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 8da95852f..efc32cbc6 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -344,6 +344,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
@@ -5970,6 +5972,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SA1100 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 59b37d638..871c87756 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -302,6 +302,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -5257,6 +5259,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 487800c59..a2fe8cce3 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -302,6 +302,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -2872,8 +2874,8 @@ CONFIG_IOMMU_DEBUGFS=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMUFD=m
-# CONFIG_IOMMUFD_TEST is not set
+CONFIG_IOMMUFD_TEST=y
+CONFIG_IOMMUFD=y
 # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
 # CONFIG_IOMMU_IO_PGTABLE_DART is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
@@ -5331,6 +5333,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index 1dbf9c42d..1691ad6e9 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -302,6 +302,8 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
+CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 # CONFIG_ARM64_VA_BITS_52 is not set
@@ -5309,6 +5311,7 @@ CONFIG_RTC_DRV_RX4581=m
 # CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
 CONFIG_RTC_DRV_RX8025=m
+# CONFIG_RTC_DRV_RX8111 is not set
 CONFIG_RTC_DRV_RX8581=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_SD3078 is not set
diff --git a/kernel.changelog b/kernel.changelog
index 782eafc67..66361df9e 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,26 @@
+* Mon May 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc1.17]
+- redhat: Switch UKI to using its own SecureBoot cert (from system-sb-certs) (Jan Stancek)
+- redhat: Add RHEL specifc .sbat section to UKI (Jan Stancek)
+- kernel.spec: add iommu selftests to kernel-selftests-internal (Eder Zulian) [RHEL-32895]
+- Linux v6.10.0-0.rc1
+Resolves: RHEL-32895
+
+* Sun May 26 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.c13320499ba0.16]
+- Linux v6.10.0-0.rc0.c13320499ba0
+Resolves: 
+
+* Sat May 25 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.56fb6f92854f.15]
+- Linux v6.10.0-0.rc0.56fb6f92854f
+Resolves: 
+
+* Fri May 24 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.6d69b6c12fce.14]
+- Linux v6.10.0-0.rc0.6d69b6c12fce
+Resolves: 
+
+* Fri May 24 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.c760b3725e52.13]
+- redhat/configs: fedora: aarch64: Re-enable CUSE (Neal Gompa)
+Resolves: 
+
 * Thu May 23 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.c760b3725e52.12]
 - Linux v6.10.0-0.rc0.c760b3725e52
 Resolves: 
diff --git a/kernel.spec b/kernel.spec
index a3422c886..f5b41581a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -163,13 +163,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.10.0
 %define specversion 6.10.0
 %define patchversion 6.10
-%define pkgrelease 0.rc0.20240523gitc760b3725e52.12
+%define pkgrelease 0.rc1.17
 %define kversion 6
-%define tarfile_release 6.9-11952-gc760b3725e52
+%define tarfile_release 6.10-rc1
 # This is needed to do merge window version magic
 %define patchlevel 10
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20240523gitc760b3725e52.12%{?buildid}%{?dist}
+%define specrelease 0.rc1.17%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.10.0
 
@@ -797,6 +797,14 @@ BuildRequires: systemd-boot-unsigned
 BuildRequires: systemd-udev >= 252-1
 # For TPM operations in UKI initramfs
 BuildRequires: tpm2-tools
+# For UKI sb cert
+%if 0%{?rhel}%{?centos} && !0%{?eln}
+%if 0%{?centos}
+BuildRequires: centos-sb-certs >= 9.0-23
+%else
+BuildRequires: redhat-sb-certs >= 9.4-0.1
+%endif
+%endif
 %endif
 
 # Because this is the kernel, it's hard to get a single upstream URL
@@ -2543,6 +2551,19 @@ BuildKernel() {
 %if %{with_efiuki}
         %{log_msg "Setup the EFI UKI kernel"}
 
+        # RHEL/CentOS specific .SBAT entries
+%if 0%{?centos}
+        SBATsuffix="centos"
+%else
+        SBATsuffix="rhel"
+%endif
+        SBAT=$(cat <<- EOF
+	linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
+	linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
+	kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
+	EOF
+	)
+
 	KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer"
     	KernelUnifiedImage="$KernelUnifiedImageDir/$InstallName-virt.efi"
 
@@ -2555,19 +2576,32 @@ BuildKernel() {
            --kmoddir "$RPM_BUILD_ROOT/lib/modules/$KernelVer/" \
            --logfile=$(mktemp) \
            --uefi \
+%if 0%{?rhel} && !0%{?eln}
+           --sbat "$SBAT" \
+%endif
            --kernel-image $(realpath $KernelImage) \
            --kernel-cmdline 'console=tty0 console=ttyS0' \
 	   $KernelUnifiedImage
 
 %if %{signkernel}
 	%{log_msg "Sign the EFI UKI kernel"}
-	%pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
+%if 0%{?fedora}%{?eln}
+        %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
+%else
+%if 0%{?centos}
+        UKI_secureboot_name=centossecureboot204
+%else
+        UKI_secureboot_name=redhatsecureboot504
+%endif
 
-    	if [ ! -s $KernelUnifiedImage.signed ]; then
-	   %{log_msg "pesigning failed"}
-      	   exit 1
-    	fi
-    	mv $KernelUnifiedImage.signed $KernelUnifiedImage
+        %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.signed -a %{secureboot_ca_0} -c $UKI_secureboot_cert -n $UKI_secureboot_name
+# 0%{?fedora}%{?eln}
+%endif
+        if [ ! -s $KernelUnifiedImage.signed ]; then
+            echo "pesigning failed"
+            exit 1
+        fi
+        mv $KernelUnifiedImage.signed $KernelUnifiedImage
 
 # signkernel
 %endif
@@ -2958,7 +2992,7 @@ pushd tools/testing/selftests
 %endif
 
 %{log_msg "main selftests compile"}
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding iommu" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
 
 %ifarch %{klptestarches}
 	# kernel livepatching selftest test_modules will build against
@@ -3323,6 +3357,12 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/memfd/{} \;
 find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/memfd/{} \;
 find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/memfd/{} \;
 popd
+# install iommu selftests
+pushd tools/testing/selftests/iommu
+find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/iommu/{} \;
+find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/iommu/{} \;
+find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/iommu/{} \;
+popd
 %endif
 
 ###
@@ -3961,6 +4001,24 @@ fi\
 #
 #
 %changelog
+* Mon May 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc1.17]
+- redhat: Switch UKI to using its own SecureBoot cert (from system-sb-certs) (Jan Stancek)
+- redhat: Add RHEL specifc .sbat section to UKI (Jan Stancek)
+- kernel.spec: add iommu selftests to kernel-selftests-internal (Eder Zulian) [RHEL-32895]
+- Linux v6.10.0-0.rc1
+
+* Sun May 26 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.c13320499ba0.16]
+- Linux v6.10.0-0.rc0.c13320499ba0
+
+* Sat May 25 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.56fb6f92854f.15]
+- Linux v6.10.0-0.rc0.56fb6f92854f
+
+* Fri May 24 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.6d69b6c12fce.14]
+- Linux v6.10.0-0.rc0.6d69b6c12fce
+
+* Fri May 24 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.c760b3725e52.13]
+- redhat/configs: fedora: aarch64: Re-enable CUSE (Neal Gompa)
+
 * Thu May 23 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc0.c760b3725e52.12]
 - Linux v6.10.0-0.rc0.c760b3725e52
 
diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch
index edf0259c8..2ab79e6db 100644
--- a/patch-6.10-redhat.patch
+++ b/patch-6.10-redhat.patch
@@ -138,7 +138,7 @@ index 000000000000..7465c78a90e6
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 452913ce42c8..9cd3a2040b3f 100644
+index f975b6396328..c4506bcedfa1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -192,10 +192,10 @@ index ee5115252aac..7f3796df8404 100644
  	  The VM uses one page of physical memory for each page table.
  	  For systems with a lot of processes, this can use a lot of
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 2f31376e85aa..9f6d8a1466a3 100644
+index 5d91259ee7b5..3a9f1962da72 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -1326,7 +1326,7 @@ endchoice
+@@ -1368,7 +1368,7 @@ endchoice
  
  config ARM64_FORCE_52BIT
  	bool "Force 52-bit virtual addresses for userspace"
@@ -819,7 +819,7 @@ index bbf7029e224b..cf7faa970dd6 100644
  		dmi_decode_ipmi((const struct dmi_header *) dev->device_data);
  
 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index b0eedc4595b3..a9024c1dd68a 100644
+index e12b531f5c2f..082707f8dff8 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -35,6 +35,7 @@
@@ -830,7 +830,7 @@ index b0eedc4595b3..a9024c1dd68a 100644
  #include <linux/delay.h>
  
  #define IPMI_DRIVER_VERSION "39.2"
-@@ -5511,8 +5512,21 @@ static int __init ipmi_init_msghandler_mod(void)
+@@ -5510,8 +5511,21 @@ static int __init ipmi_init_msghandler_mod(void)
  {
  	int rv;
  
@@ -1714,7 +1714,7 @@ index a00671b58701..eeef2766b8b3 100644
  	if (ret < 0)
  		goto err_allowedips;
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index bf7615cb36ee..b5ac1fbc3c73 100644
+index 954f850f113a..35162a8dc97a 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
 @@ -261,6 +261,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1735,15 +1735,18 @@ index bf7615cb36ee..b5ac1fbc3c73 100644
  	AUTHENTICATE,
  };
  
-@@ -386,15 +390,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
- 	if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED)
- 		return AUTHENTICATE;
+@@ -383,7 +387,7 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
+ 	if (likely(nvme_req(req)->status == 0))
+ 		return COMPLETE;
  
 -	if (blk_noretry_request(req) ||
 +	if ((req->cmd_flags & (REQ_FAILFAST_DEV | REQ_FAILFAST_DRIVER)) ||
  	    (nvme_req(req)->status & NVME_SC_DNR) ||
  	    nvme_req(req)->retries >= nvme_max_retries)
  		return COMPLETE;
+@@ -391,10 +395,11 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
+ 	if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED)
+ 		return AUTHENTICATE;
  
 -	if (req->cmd_flags & REQ_NVME_MPATH) {
 +	if (req->cmd_flags & (REQ_NVME_MPATH | REQ_FAILFAST_TRANSPORT)) {
@@ -1828,7 +1831,7 @@ index d16e976ae1a4..4dd28efacef0 100644
  
  	if (!ctrl->max_namespaces ||
 diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 05532c281177..a2138cba0ec3 100644
+index cacc56f4bbf4..486a80ddfc49 100644
 --- a/drivers/nvme/host/nvme.h
 +++ b/drivers/nvme/host/nvme.h
 @@ -946,6 +946,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
@@ -2230,10 +2233,10 @@ index a14f6013e316..6c20453fdf76 100644
  
  error_proc:
 diff --git a/fs/erofs/super.c b/fs/erofs/super.c
-index 348ef1660e50..a7d5fcf5452e 100644
+index c93bd24d2771..84f0c3a85d40 100644
 --- a/fs/erofs/super.c
 +++ b/fs/erofs/super.c
-@@ -582,6 +582,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
+@@ -580,6 +580,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
  {
  	struct inode *inode;
  	struct erofs_sb_info *sbi = EROFS_SB(sb);
@@ -2243,7 +2246,7 @@ index 348ef1660e50..a7d5fcf5452e 100644
  	int err;
  
  	sb->s_magic = EROFS_SUPER_MAGIC;
-@@ -687,6 +690,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
+@@ -685,6 +688,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
  		return err;
  
  	erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid);
diff --git a/sources b/sources
index 36e593c53..b1b34902c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd
 SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6
-SHA512 (linux-6.9-11952-gc760b3725e52.tar.xz) = 359c21a1c8ca15289dbff10fbfe15d94a93a5294ee1d4d6aa38e690cb07a245578e2972875e7638f737fcddcf5bbef710f2edf99858f2fe089ea3273633b8a82
-SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 85123f274baf50a21506c08321c6202c0a72490769b1c8d04c3c9a36b3f60bc3cd8bbc10e44c27d5d7b2c367055bd67d820af0a415cad12bd54e0092662ff86c
-SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 14c96b1dca2a418bf5fff337ee4fdd42153bb111ddf25c102a054132e227be2083889aef8b1b47a99aacc14f37c867d5b764d308373ab74595520fb796ce5954
+SHA512 (linux-6.10-rc1.tar.xz) = 842f3bb3ba0d1fe010975f07f1b420bea9c7b98bf9e5dde3926d3c74447bc870b931a9042db86cde10da11dec9d4896b25b99504e6759aab27ffee12294d1fe7
+SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = d1a48e2599da3883cd78198c012a124320c3ef9c6fcd43c20e05a1c5cf73a9fab31791f13b9666e0e58c619533a65fe24170eb43e3baf9491a4e75ade1f398ed
+SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 2d3814afb241aab6beae5ac1cb3614a946c4f13cc66305d7812bf7de79a05a4e051a1008485d525fb3c3d3211617c7895b96cb7323305534fbfaeb1392152b71