diff --git a/Makefile.rhelver b/Makefile.rhelver
index 7db7c7804..5a714338d 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 = 18
+RHEL_RELEASE = 21
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index cfad14654..c732fbf72 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -6313,6 +6313,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -7161,7 +7162,7 @@ CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
 CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 # CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index a6f062e97..182ceb017 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -6286,6 +6286,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -7134,7 +7135,7 @@ CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
 CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 # CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 9045f8d3d..94c835a3a 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -5134,6 +5134,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index d7a21f137..1c4c2eca8 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -5111,6 +5111,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index fdf898886..cae19378a 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -6312,6 +6312,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -7160,7 +7161,7 @@ CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
 CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 # CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 3477003e4..33103832a 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -5130,6 +5130,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 173745b75..a1cab5dc7 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -6285,6 +6285,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -7133,7 +7134,7 @@ CONFIG_SC_GPUCC_7180=m
 CONFIG_SC_GPUCC_7280=m
 CONFIG_SC_GPUCC_8280XP=m
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 # CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 21011aca0..d98688475 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -5107,6 +5107,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 5f49a69c0..1b7a83cf6 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -1644,6 +1644,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MSM is not set
 # CONFIG_DRM_MXSFB is not set
@@ -5170,17 +5171,18 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_BEHAVIOUR is not set
-CONFIG_PREEMPT_DYNAMIC=y
+# CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE_BEHAVIOUR is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_NOTIFIERS=y
-# CONFIG_PREEMPT_RT is not set
+CONFIG_PREEMPT_RT=y
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PRESTERA is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRIME_NUMBERS=m
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index bd56a4766..708e964e1 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -1636,6 +1636,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MSM is not set
 # CONFIG_DRM_MXSFB is not set
@@ -5147,17 +5148,18 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_BEHAVIOUR is not set
-CONFIG_PREEMPT_DYNAMIC=y
+# CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE_BEHAVIOUR is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_NOTIFIERS=y
-# CONFIG_PREEMPT_RT is not set
+CONFIG_PREEMPT_RT=y
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PRESTERA is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRIME_NUMBERS=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 0a87c2bfa..c835bd931 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -4826,8 +4826,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 # CONFIG_OF_OVERLAY_KUNIT_TEST is not set
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
@@ -5185,6 +5185,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -5814,7 +5815,7 @@ CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 CONFIG_SCF_TORTURE_TEST=m
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 00fafdc60..6860d567e 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4662,7 +4662,6 @@ CONFIG_POWER_RESET_GPIO=y
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4728,6 +4727,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 509ccb376..6b2d9d217 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -4798,8 +4798,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 # CONFIG_OF_OVERLAY_KUNIT_TEST is not set
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
@@ -5156,6 +5156,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -5785,7 +5786,7 @@ CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 5a1883c26..3dc04acef 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -4641,7 +4641,6 @@ CONFIG_POWER_RESET_GPIO=y
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4707,6 +4706,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 8bed1cf05..fade5c789 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -5184,6 +5184,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -5858,7 +5859,7 @@ CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 CONFIG_SCF_TORTURE_TEST=m
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index 68d4355e3..f149b5c80 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -5155,6 +5155,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -5829,7 +5830,7 @@ CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 0139e769b..2f178e897 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -4792,6 +4792,7 @@ CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPAL_CORE is not set
 # CONFIG_OPEN_DICE is not set
@@ -5101,6 +5102,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -5740,7 +5742,7 @@ CONFIG_SCD30_SERIAL=m
 CONFIG_SCF_TORTURE_TEST=m
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_BOOK=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 02a8e8b3a..f460783e0 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4041,7 +4041,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_NET_VENDOR_META is not set
 # CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_NET_VENDOR_MYRI is not set
@@ -4346,8 +4346,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OMFS_FS is not set
@@ -4631,7 +4631,6 @@ CONFIG_POWERNV_OP_PANEL=m
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4660,6 +4659,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 497733cdf..cb2d82ab5 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -4764,6 +4764,7 @@ CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPAL_CORE is not set
 # CONFIG_OPEN_DICE is not set
@@ -5072,6 +5073,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -5711,7 +5713,7 @@ CONFIG_SCD30_SERIAL=m
 # CONFIG_SCF_TORTURE_TEST is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_BOOK=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 2e9115e35..08b6f7414 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -4021,7 +4021,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_NET_VENDOR_META is not set
 # CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_NET_VENDOR_MYRI is not set
@@ -4326,8 +4326,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OMFS_FS is not set
@@ -4610,7 +4610,6 @@ CONFIG_POWERNV_OP_PANEL=m
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4639,6 +4638,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 25011cbe9..83016a766 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -4031,7 +4031,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_NET_VENDOR_META is not set
 # CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
 CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_NET_VENDOR_MYRI is not set
@@ -4337,8 +4337,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OMFS_FS is not set
@@ -4621,7 +4621,6 @@ CONFIG_POWERNV_OP_PANEL=m
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4650,6 +4649,7 @@ CONFIG_PPS_CLIENT_LDISC=y
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 4ed45bfe1..c934f593d 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5220,6 +5220,7 @@ CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPAL_CORE is not set
 # CONFIG_OPEN_DICE is not set
@@ -5595,6 +5596,7 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -6235,7 +6237,7 @@ CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 CONFIG_SCF_TORTURE_TEST=m
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 672313c50..18ae1370d 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4591,8 +4591,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OMFS_FS is not set
@@ -4918,7 +4918,6 @@ CONFIG_POWERNV_OP_PANEL=m
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4948,6 +4947,7 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index bbcb5d289..4381ec490 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5194,6 +5194,7 @@ CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 # CONFIG_OMFS_FS is not set
 # CONFIG_OPAL_CORE is not set
 # CONFIG_OPEN_DICE is not set
@@ -5567,6 +5568,7 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
@@ -6207,7 +6209,7 @@ CONFIG_SCD30_SERIAL=m
 # CONFIG_SCD4X is not set
 # CONFIG_SCF_TORTURE_TEST is not set
 CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SCHED_CLASS_EXT is not set
+CONFIG_SCHED_CLASS_EXT=y
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_CORE=y
 CONFIG_SCHED_DEBUG=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index c58726dcb..a948032a6 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4571,8 +4571,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OMFS_FS is not set
@@ -4896,7 +4896,6 @@ CONFIG_POWERNV_OP_PANEL=m
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4926,6 +4925,7 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 CONFIG_PREEMPT_DYNAMIC=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index abc80e21e..64d03104f 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -1521,6 +1521,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
@@ -4631,8 +4632,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OMFS_FS is not set
@@ -4958,7 +4959,6 @@ CONFIG_POWERNV_OP_PANEL=m
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4988,17 +4988,18 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_BEHAVIOUR is not set
-CONFIG_PREEMPT_DYNAMIC=y
+# CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE_BEHAVIOUR is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_NOTIFIERS=y
-# CONFIG_PREEMPT_RT is not set
+CONFIG_PREEMPT_RT=y
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PRESTERA is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRIME_NUMBERS=m
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index 90460b8cd..f12517452 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -1513,6 +1513,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+CONFIG_DRM_MGAG200_DISABLE_WRITECOMBINE=y
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
@@ -4611,8 +4612,8 @@ CONFIG_OCTEON_EP_VF=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 CONFIG_OF_KUNIT_TEST=m
-# CONFIG_OF_OVERLAY is not set
 CONFIG_OF_OVERLAY_KUNIT_TEST=m
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 # CONFIG_OMFS_FS is not set
@@ -4936,7 +4937,6 @@ CONFIG_POWERNV_OP_PANEL=m
 # CONFIG_POWER_RESET_VEXPRESS is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_SEQUENCING is not set
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
@@ -4966,17 +4966,18 @@ CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_PPS=y
 CONFIG_PPTP=m
+# CONFIG_PREEMPT_AUTO is not set
 # CONFIG_PREEMPT_BEHAVIOUR is not set
-CONFIG_PREEMPT_DYNAMIC=y
+# CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_NONE_BEHAVIOUR is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_NOTIFIERS=y
-# CONFIG_PREEMPT_RT is not set
+CONFIG_PREEMPT_RT=y
 # CONFIG_PREEMPT_TRACER is not set
 # CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PRESTERA is not set
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRIME_NUMBERS=m
diff --git a/kernel.changelog b/kernel.changelog
index f233f95a6..53a35bf10 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,19 @@
+* Fri Oct 04 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc1.0c559323bbaa.21]
+- configs for RT deps (Clark Williams)
+- Linux v6.12.0-0.rc1.0c559323bbaa
+Resolves: 
+
+* Thu Oct 03 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc1.e32cde8d2bd7.20]
+- CONFIG_OF_OVERLAY: enable for aarch64 and powerpc (Scott Weaver)
+- redhat: enable changes to build rt variants (Clark Williams)
+- redhat: clean up pending-rhel (Patrick Talbert)
+- Enable CONFIG_SCHED_CLASS_EXT for Fedora (Jose Fernandez)
+Resolves: 
+
+* Wed Oct 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc1.e32cde8d2bd7.19]
+- redhat/configs: new config in arch/s390 (Izabela Bakollari)
+Resolves: 
+
 * Tue Oct 01 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc1.e32cde8d2bd7.18]
 - redhat: ignore rpminspect runpath report on selftests/bpf/cpuv4/urandom_read (Viktor Malik)
 - Linux v6.12.0-0.rc1.e32cde8d2bd7
diff --git a/kernel.spec b/kernel.spec
index 57bacfc8a..d27cd0a59 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -163,13 +163,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.12.0
 %define specversion 6.12.0
 %define patchversion 6.12
-%define pkgrelease 0.rc1.20241001gite32cde8d2bd7.18
+%define pkgrelease 0.rc1.20241004git0c559323bbaa.21
 %define kversion 6
-%define tarfile_release 6.12-rc1-31-ge32cde8d2bd7
+%define tarfile_release 6.12-rc1-125-g0c559323bbaa
 # This is needed to do merge window version magic
 %define patchlevel 12
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20241001gite32cde8d2bd7.18%{?buildid}%{?dist}
+%define specrelease 0.rc1.20241004git0c559323bbaa.21%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.12.0
 
@@ -207,7 +207,7 @@ Summary: The Linux kernel
 # kernel-64k (aarch64 kernel with 64K page_size)
 %define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
 # kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel)
-%define with_realtime  %{?_with_realtime:     1} %{?!_with_realtime:     0}
+%define with_realtime  %{?_without_realtime:  0} %{?!_without_realtime:  1}
 
 # Supported variants
 #            with_base with_debug    with_gcov
@@ -1871,7 +1871,7 @@ chmod +x scripts/checkpatch.pl
 mv COPYING COPYING-%{specrpmversion}-%{release}
 
 # on linux-next prevent scripts/setlocalversion from mucking with our version numbers
-rm -f localversion-next
+rm -f localversion-next localversion-rt
 
 # Mangle /usr/bin/python shebangs to /usr/bin/python3
 # Mangle all Python shebangs to be Python 3 explicitly
@@ -4136,6 +4136,19 @@ fi\
 #
 #
 %changelog
+* Fri Oct 04 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc1.0c559323bbaa.21]
+- configs for RT deps (Clark Williams)
+- Linux v6.12.0-0.rc1.0c559323bbaa
+
+* Thu Oct 03 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc1.e32cde8d2bd7.20]
+- CONFIG_OF_OVERLAY: enable for aarch64 and powerpc (Scott Weaver)
+- redhat: enable changes to build rt variants (Clark Williams)
+- redhat: clean up pending-rhel (Patrick Talbert)
+- Enable CONFIG_SCHED_CLASS_EXT for Fedora (Jose Fernandez)
+
+* Wed Oct 02 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc1.e32cde8d2bd7.19]
+- redhat/configs: new config in arch/s390 (Izabela Bakollari)
+
 * Tue Oct 01 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc1.e32cde8d2bd7.18]
 - redhat: ignore rpminspect runpath report on selftests/bpf/cpuv4/urandom_read (Viktor Malik)
 - Linux v6.12.0-0.rc1.e32cde8d2bd7
diff --git a/patch-6.12-redhat.patch b/patch-6.12-redhat.patch
index c3bd20aeb..85247366a 100644
--- a/patch-6.12-redhat.patch
+++ b/patch-6.12-redhat.patch
@@ -1945,7 +1945,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 ba6508455e18..8e88be5e6938 100644
+index 43d73d31c66f..e0ff0b221f62 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
 @@ -263,6 +263,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -2185,7 +2185,7 @@ index 76a1e373386e..e110b9e75aa2 100644
  	{ 0 }
  };
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index e044ed09d7e0..aa5f9c19d222 100644
+index 0c49414c1f35..14e6d2c11f84 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
 @@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
@@ -2286,7 +2286,7 @@ index 0b1616e93cf4..85fc52038a82 100644
  		PCI_ANY_ID, PCI_ANY_ID, },
  	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
 diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
-index 4ecf5284c0fc..40fdd84542a8 100644
+index 8e75e2e279a4..90866366148b 100644
 --- a/drivers/scsi/megaraid/megaraid_sas_base.c
 +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
 @@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
@@ -2318,7 +2318,7 @@ index 4ecf5284c0fc..40fdd84542a8 100644
  	/* Fusion */
  	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
 diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
-index 728cced42b0e..bc968039be01 100644
+index f2a55aa5fe65..8f4a054ae99f 100644
 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
 +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
 @@ -12567,6 +12567,7 @@ scsih_pci_mmio_enabled(struct pci_dev *pdev)
@@ -2401,7 +2401,7 @@ index d91f54a6e752..0b76e1bf20b7 100644
  };
  MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 41e2dfa2d67d..23f8c65755f8 100644
+index ca4bc0ac76ad..4442ff2a5e19 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
 @@ -121,6 +121,14 @@ static const char *sd_cache_types[] = {
@@ -3407,7 +3407,7 @@ index 87866b037fbe..2cec0dc5f15a 100644
  obj-$(CONFIG_MULTIUSER) += groups.o
  obj-$(CONFIG_VHOST_TASK) += vhost_task.o
 diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
-index 4e07cc057d6f..56bc91fcd142 100644
+index 5e77c58e0601..4de8774458ac 100644
 --- a/kernel/bpf/core.c
 +++ b/kernel/bpf/core.c
 @@ -566,7 +566,12 @@ void bpf_prog_kallsyms_del_all(struct bpf_prog *fp)
diff --git a/sources b/sources
index ce6805624..29b5e1850 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.12-rc1-31-ge32cde8d2bd7.tar.xz) = aa1efa979f5a358e73025a78545096ff354201031b3803035b3d1fbcb251a1fed2d454cee03c6b612cdd8b01fe8f02461e628dbf8395c204ef12004cd65d9aaa
-SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = b54b14d13c4e8fb4094c36c7cdf6324edc04d51932c88508f327ddca31303465f750bc0712def18e25218d0488e24ffd0e1ead088ebb3bf6630c2306dfadd52c
-SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 8fa15b0374161982a1aa1b942c78865cca476f5a80be41ffb5156bb7e8e463e1f71ac3488ce733f03632b3c5923e5834fd8d87a074044128812cd39995159ba3
+SHA512 (linux-6.12-rc1-125-g0c559323bbaa.tar.xz) = 57a21faca4d525f53ad5c4613933e625a6dcb0b5edd7d7a4512d4725252cf798f8bee3dd30b75715b4021322bddb9ba8dcbe77fb02adeaf6421110ba15908c31
+SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 8a806ce086c628a391f12aeafc72a57199621cfa7a180ef5b325a5e8d69de070b4b1728317a0fa26fe6ae8a5a1908d001b5670cb01023ed7c295b0b78c8d75f8
+SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 9cb083428c56750b8b9a03a0f91eaad7280fa806d5c164ff21de972cb9ef93e2d9c6b0b786427836ce7ce8f2ad8604a728c56d029ef64e62e9f02c9b4f6e5d23