diff --git a/Makefile.rhelver b/Makefile.rhelver
index c9670fb00..47598f6b1 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 = 23
+RHEL_RELEASE = 24
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index d3c4bd7e8..8c484bae5 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -8373,7 +8373,7 @@ CONFIG_SPI_SYNQUACER=m
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 CONFIG_SPI_THUNDERX=m
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index 76fb65a74..8a68b5463 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -8344,7 +8344,7 @@ CONFIG_SPI_SYNQUACER=m
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 CONFIG_SPI_THUNDERX=m
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index db35b6de8..bf89da291 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -377,7 +377,7 @@ CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_DMC620_PMU=m
 CONFIG_ARM_DSU_PMU=m
-# CONFIG_ARM_FFA_TRANSPORT is not set
+CONFIG_ARM_FFA_TRANSPORT=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_IMX_BUS_DEVFREQ=m
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
@@ -6822,7 +6822,7 @@ CONFIG_SPI_QUP=y
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_XCOMM is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 6f0a326c0..0abc2177f 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -377,7 +377,7 @@ CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_DMC620_PMU=m
 CONFIG_ARM_DSU_PMU=m
-# CONFIG_ARM_FFA_TRANSPORT is not set
+CONFIG_ARM_FFA_TRANSPORT=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_IMX_BUS_DEVFREQ=m
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
@@ -6797,7 +6797,7 @@ CONFIG_SPI_QUP=y
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_XCOMM is not set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 02dc5d293..e4ea0678e 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -8372,7 +8372,7 @@ CONFIG_SPI_SYNQUACER=m
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 CONFIG_SPI_THUNDERX=m
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index b98d0660a..dd0a74e68 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -375,7 +375,7 @@ CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_DMC620_PMU=m
 CONFIG_ARM_DSU_PMU=m
-# CONFIG_ARM_FFA_TRANSPORT is not set
+CONFIG_ARM_FFA_TRANSPORT=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_IMX_BUS_DEVFREQ=m
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
@@ -6818,7 +6818,7 @@ CONFIG_SPI_QUP=y
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_XCOMM is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index fd331e422..3c298dca4 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -8343,7 +8343,7 @@ CONFIG_SPI_SYNQUACER=m
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 CONFIG_SPI_THUNDERX=m
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 49d0fd703..9f81f7824 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -375,7 +375,7 @@ CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_DMC620_PMU=m
 CONFIG_ARM_DSU_PMU=m
-# CONFIG_ARM_FFA_TRANSPORT is not set
+CONFIG_ARM_FFA_TRANSPORT=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_IMX_BUS_DEVFREQ=m
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
@@ -6793,7 +6793,7 @@ CONFIG_SPI_QUP=y
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_XCOMM is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 84a64c6f1..c5c64b0f2 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -375,7 +375,7 @@ CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_DMC620_PMU=m
 CONFIG_ARM_DSU_PMU=m
-# CONFIG_ARM_FFA_TRANSPORT is not set
+CONFIG_ARM_FFA_TRANSPORT=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_IMX_BUS_DEVFREQ=m
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
@@ -6871,7 +6871,7 @@ CONFIG_SPI_QUP=y
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_XCOMM is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index dfaba411f..94dec4325 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -375,7 +375,7 @@ CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_DMC620_PMU=m
 CONFIG_ARM_DSU_PMU=m
-# CONFIG_ARM_FFA_TRANSPORT is not set
+CONFIG_ARM_FFA_TRANSPORT=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_ARM_IMX_BUS_DEVFREQ=m
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
@@ -6846,7 +6846,7 @@ CONFIG_SPI_QUP=y
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
-CONFIG_SPI_TEGRA210_QUAD=m
+CONFIG_SPI_TEGRA210_QUAD=y
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_XCOMM is not set
diff --git a/kernel.changelog b/kernel.changelog
index 53afb30a3..72701b7da 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,10 @@
+* Tue Apr 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.9.0-0.rc2.026e680b0a08.24]
+- redhat/configs: build in Tegra210 SPI driver (Mark Salter)
+- redhat/configs: aarch64: Enable ARM_FFA driver (Mark Salter)
+- Base automotive-devel on rt-devel (Don Zickus)
+- Linux v6.9.0-0.rc2.026e680b0a08
+Resolves: 
+
 * Mon Apr 01 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.9.0-0.rc2.23]
 - Linux v6.9.0-0.rc2
 Resolves: 
diff --git a/kernel.spec b/kernel.spec
index 85dc7dda4..236941d9d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -163,13 +163,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.9.0
 %define specversion 6.9.0
 %define patchversion 6.9
-%define pkgrelease 0.rc2.23
+%define pkgrelease 0.rc2.20240402git026e680b0a08.24
 %define kversion 6
-%define tarfile_release 6.9-rc2
+%define tarfile_release 6.9-rc2-2-g026e680b0a08
 # This is needed to do merge window version magic
 %define patchlevel 9
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.23%{?buildid}%{?dist}
+%define specrelease 0.rc2.20240402git026e680b0a08.24%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.9.0
 
@@ -3958,6 +3958,12 @@ fi\
 #
 #
 %changelog
+* Tue Apr 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.9.0-0.rc2.026e680b0a08.24]
+- redhat/configs: build in Tegra210 SPI driver (Mark Salter)
+- redhat/configs: aarch64: Enable ARM_FFA driver (Mark Salter)
+- Base automotive-devel on rt-devel (Don Zickus)
+- Linux v6.9.0-0.rc2.026e680b0a08
+
 * Mon Apr 01 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.9.0-0.rc2.23]
 - Linux v6.9.0-0.rc2
 
diff --git a/sources b/sources
index 89da602d9..fa48d7aaf 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-rc2.tar.xz) = ffd5b085231cccf2d4813bf1829e1fda1bba749ca36fb3cfae17ecfc49a6a7e3b76b3b61c45d4e393b7ae3c43aca30fe15c2b35ee6b234f6b04e44fbc61796a4
-SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 6e6ac636cb435326836a48f75b650b7cffc3058800b0b4d629ea3978ce7b42bb4859aca14a9d019b724199bc94db82ea6d74c47a7e37481819cc1435abfb77f2
-SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 2d2b02ddc67ff476648ca66212972c8a4b8e59dc27a21076ec93426324c4bbffaaac0da74a09e06ef14eaa842081a843151113deb52a1841af912bfe91da6854
+SHA512 (linux-6.9-rc2-2-g026e680b0a08.tar.xz) = ddacab9822e6d075e465dc2476a4ce853d9bf04b4094a817861f46da0e3a19d689ee074ec5a29d41d5185b7fb994b93c39ff532627eeeea22bfe08907727b495
+SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 9732669ad3d860ac77b7f5f068269dd4dd7d861cc2eec73e7ea7ccbd84d3bed371fd3c62cbe902f3efda852c36b00412db2805ec977d6b177a22e598b9b60f17
+SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 7d139472b25e2f532f67a3b02d665a1bf25677e3253e637b21ec3e68a3a2f1b7894ff8d438c014911e9160298bd144daab3c2d76acc3f32a7ba949de07b7af66