diff --git a/Makefile.rhelver b/Makefile.rhelver
index 9eeb9b728..be7005581 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 = 62
+RHEL_RELEASE = 64
 
 #
 # RHEL_REBASE_NUM
diff --git a/def_variants.yaml.fedora b/def_variants.yaml.fedora
index 5d2c1060e..ce3549b03 100644
--- a/def_variants.yaml.fedora
+++ b/def_variants.yaml.fedora
@@ -259,6 +259,7 @@ rules:
   - drivers/pps/.*: modules-core
   - drivers/ptp/ptp_kvm.*: modules-rt-kvm
     if_variant_in: ["rt"]
+  - drivers/ptp/ptp_mock.*: modules-internal
   - drivers/ptp/ptp_dfl_tod.*: modules
   - drivers/ptp/.*: modules-core
   - drivers/pwm/.*: modules-core
diff --git a/def_variants.yaml.rhel b/def_variants.yaml.rhel
index bc3f5e0a9..49acee7c5 100644
--- a/def_variants.yaml.rhel
+++ b/def_variants.yaml.rhel
@@ -263,6 +263,7 @@ rules:
   - drivers/pps/.*: modules-core
   - drivers/ptp/ptp_kvm.*: modules-rt-kvm
     if_variant_in: ["rt"]
+  - drivers/ptp/ptp_mock.*: modules-internal
   - drivers/ptp/ptp_dfl_tod.*: modules
   - drivers/ptp/.*: modules-core
   - drivers/pwm/.*: modules-core
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index 2055ccf4b..04e8ec80c 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -2226,9 +2226,28 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_WERROR=y
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+CONFIG_DRM_XE_DISPLAY=y
+CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y
+CONFIG_DRM_XE_FORCE_PROBE=""
+CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000
+CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_KUNIT_TEST is not set
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+CONFIG_DRM_XE=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set
+CONFIG_DRM_XE_TIMESLICE_MAX=10000000
+CONFIG_DRM_XE_TIMESLICE_MIN=1
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
+# CONFIG_DRM_XE_WERROR is not set
 CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
@@ -6231,7 +6250,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index d79c9c633..6f2c0156e 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -2217,9 +2217,28 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_WERROR=y
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+CONFIG_DRM_XE_DISPLAY=y
+CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y
+CONFIG_DRM_XE_FORCE_PROBE=""
+CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000
+CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_KUNIT_TEST is not set
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+CONFIG_DRM_XE=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set
+CONFIG_DRM_XE_TIMESLICE_MAX=10000000
+CONFIG_DRM_XE_TIMESLICE_MIN=1
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
+# CONFIG_DRM_XE_WERROR is not set
 CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
@@ -6204,7 +6223,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 409d0bdab..d321872d7 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -3511,6 +3511,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAILBOX_TEST=m
 CONFIG_MAILBOX=y
 # CONFIG_MANAGER_SBS is not set
+CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
@@ -3783,7 +3784,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -5088,7 +5089,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 71f511ba9..87957807b 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -3490,6 +3490,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_MAILBOX=y
 # CONFIG_MANAGER_SBS is not set
+CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
@@ -3762,7 +3763,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -5065,7 +5066,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index ad6a73ab8..1fa802e9f 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2226,9 +2226,28 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_WERROR=y
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+CONFIG_DRM_XE_DISPLAY=y
+CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y
+CONFIG_DRM_XE_FORCE_PROBE=""
+CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000
+CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_KUNIT_TEST is not set
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+CONFIG_DRM_XE=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set
+CONFIG_DRM_XE_TIMESLICE_MAX=10000000
+CONFIG_DRM_XE_TIMESLICE_MIN=1
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
+# CONFIG_DRM_XE_WERROR is not set
 CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
@@ -6230,7 +6249,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index efb3120e7..3ad2f2745 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -3508,6 +3508,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAILBOX_TEST=m
 CONFIG_MAILBOX=y
 # CONFIG_MANAGER_SBS is not set
+CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
@@ -3780,7 +3781,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -5084,7 +5085,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 8c8df3a02..46eec69be 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2217,9 +2217,28 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_WERROR=y
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+CONFIG_DRM_XE_DISPLAY=y
+CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y
+CONFIG_DRM_XE_FORCE_PROBE=""
+CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000
+CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_KUNIT_TEST is not set
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+CONFIG_DRM_XE=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set
+CONFIG_DRM_XE_TIMESLICE_MAX=10000000
+CONFIG_DRM_XE_TIMESLICE_MIN=1
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
+# CONFIG_DRM_XE_WERROR is not set
 CONFIG_DRM=y
 CONFIG_DRM_ZYNQMP_DPSUB=m
 # CONFIG_DS1682 is not set
@@ -6203,7 +6222,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 5230e1379..0c92a83b1 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3487,6 +3487,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_MAILBOX=y
 # CONFIG_MANAGER_SBS is not set
+CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
@@ -3759,7 +3760,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -5061,7 +5062,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 719ab5ba8..a3581e67d 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -3548,6 +3548,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAILBOX_TEST=m
 CONFIG_MAILBOX=y
 # CONFIG_MANAGER_SBS is not set
+CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
@@ -3825,7 +3826,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -5133,7 +5134,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 8bcec9d30..461605dce 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -3527,6 +3527,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_MAILBOX=y
 # CONFIG_MANAGER_SBS is not set
+CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
@@ -3804,7 +3805,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -5110,7 +5111,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 50873fb54..98a383795 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1676,9 +1676,28 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_WERROR=y
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+CONFIG_DRM_XE_DISPLAY=y
+CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y
+CONFIG_DRM_XE_FORCE_PROBE=""
+CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000
+CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_KUNIT_TEST is not set
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+CONFIG_DRM_XE=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set
+CONFIG_DRM_XE_TIMESLICE_MAX=10000000
+CONFIG_DRM_XE_TIMESLICE_MIN=1
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
+# CONFIG_DRM_XE_WERROR is not set
 CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@@ -5123,7 +5142,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index b22c084f8..bfddc7eb3 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -3459,7 +3459,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -4694,7 +4693,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 41a873957..fc86ea78b 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1665,9 +1665,28 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_WERROR=y
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+CONFIG_DRM_XE_DISPLAY=y
+CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y
+CONFIG_DRM_XE_FORCE_PROBE=""
+CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000
+CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_KUNIT_TEST is not set
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+CONFIG_DRM_XE=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set
+CONFIG_DRM_XE_TIMESLICE_MAX=10000000
+CONFIG_DRM_XE_TIMESLICE_MIN=1
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
+# CONFIG_DRM_XE_WERROR is not set
 CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@@ -5094,7 +5113,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index dec5f4058..6fa60ca82 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -3439,7 +3439,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -4673,7 +4672,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 12a46c435..af0d329d2 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1682,9 +1682,28 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_WERROR=y
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+CONFIG_DRM_XE_DISPLAY=y
+CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y
+CONFIG_DRM_XE_FORCE_PROBE=""
+CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000
+CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_KUNIT_TEST is not set
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+CONFIG_DRM_XE=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set
+CONFIG_DRM_XE_TIMESLICE_MAX=10000000
+CONFIG_DRM_XE_TIMESLICE_MIN=1
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
+# CONFIG_DRM_XE_WERROR is not set
 CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@@ -5040,7 +5059,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 89a730f67..5eadfbf16 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -3441,7 +3441,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MINIX_FS is not set
@@ -4627,7 +4626,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index f6be8735e..5b45ac50c 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1671,9 +1671,28 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_MKSSTATS is not set
-# CONFIG_DRM_WERROR is not set
-# CONFIG_DRM_XE is not set
+CONFIG_DRM_WERROR=y
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+CONFIG_DRM_XE_DISPLAY=y
+CONFIG_DRM_XE_ENABLE_SCHEDTIMEOUT_LIMIT=y
+CONFIG_DRM_XE_FORCE_PROBE=""
+CONFIG_DRM_XE_JOB_TIMEOUT_MAX=10000
+CONFIG_DRM_XE_JOB_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_KUNIT_TEST is not set
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+CONFIG_DRM_XE=m
 # CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_XE_PREEMPT_TIMEOUT=640000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MAX=10000000
+CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN=1
+# CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE is not set
+CONFIG_DRM_XE_TIMESLICE_MAX=10000000
+CONFIG_DRM_XE_TIMESLICE_MIN=1
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
+# CONFIG_DRM_XE_WERROR is not set
 CONFIG_DRM=y
 # CONFIG_DS1682 is not set
 # CONFIG_DS1803 is not set
@@ -5011,7 +5030,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 55ce762a7..6d0251afe 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -3421,7 +3421,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MINIX_FS is not set
@@ -4606,7 +4605,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK=y
 # CONFIG_PUNIT_ATOM_DEBUG is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index fc1073b05..38fa47800 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -3430,7 +3430,6 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROCHIP_T1S_PHY is not set
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MINIX_FS is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 084607e2a..6ee012d1e 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1841,7 +1841,7 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_MKSSTATS=y
-# CONFIG_DRM_WERROR is not set
+CONFIG_DRM_WERROR=y
 # CONFIG_DRM_XE_DEBUG is not set
 # CONFIG_DRM_XE_DEBUG_MEM is not set
 # CONFIG_DRM_XE_DEBUG_SRIOV is not set
@@ -5547,7 +5547,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_VMW=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index ec63210d9..20249e296 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -3658,7 +3658,7 @@ CONFIG_MICROCODE_INTEL=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -4910,7 +4910,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_VMW=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 2967869cc..6f5ca019d 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1830,7 +1830,7 @@ CONFIG_DRM_VKMS=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_MKSSTATS=y
-# CONFIG_DRM_WERROR is not set
+CONFIG_DRM_WERROR=y
 # CONFIG_DRM_XE_DEBUG is not set
 # CONFIG_DRM_XE_DEBUG_MEM is not set
 # CONFIG_DRM_XE_DEBUG_SRIOV is not set
@@ -5519,7 +5519,7 @@ CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_VMW=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index d29828c70..c36e13dce 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -3638,7 +3638,7 @@ CONFIG_MICROCODE_INTEL=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -4888,7 +4888,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_VMW=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 1f98ab30d..c7c288ff4 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -3703,7 +3703,7 @@ CONFIG_MICROCODE_INTEL=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -4959,7 +4959,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_VMW=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index f89e9e25c..7d4f8a476 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -3683,7 +3683,7 @@ CONFIG_MICROCODE_INTEL=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
 CONFIG_MICROCODE=y
 CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
 CONFIG_MIGRATION=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
@@ -4937,7 +4937,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
-# CONFIG_PTP_1588_CLOCK_MOCK is not set
+CONFIG_PTP_1588_CLOCK_MOCK=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_VMW=m
 CONFIG_PTP_1588_CLOCK=y
diff --git a/kernel.changelog b/kernel.changelog
index cf869411f..dbc9d2242 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,5 +1,18 @@
-* Fri Jul 12 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc7.43db1e03c086.62]
-- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
+* Mon Jul 15 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-64]
+- Linux v6.10.0
+Resolves: 
+
+* Sun Jul 14 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc7.4d145e3f830b.63]
+- Consolidate configs to common for 6.10 (Justin M. Forbes)
+- Linux v6.10.0-0.rc7.4d145e3f830b
+Resolves: 
+
+* Sat Jul 13 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc7.528dd46d0fc3.62]
+- redhat/configs: Enable CONFIG_PTP_1588_CLOCK_MOCK in kernel-modules-internal (Davide Caratti)
+- fedora: enabled XE GPU drivers on all arches (Peter Robinson)
+- Flip SND_SOC_CS35L56_SPI from off to module for RHEL (Justin M. Forbes)
+- Flip DIMLIB from built-in to module for RHEL (Justin M. Forbes)
+- Linux v6.10.0-0.rc7.528dd46d0fc3
 Resolves: 
 
 * Fri Jul 12 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc7.43db1e03c086.61]
diff --git a/kernel.spec b/kernel.spec
index 0ba313ca1..4cd8a64a6 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.rc7.20240712git43db1e03c086.62
+%define pkgrelease 64
 %define kversion 6
-%define tarfile_release 6.10-rc7-141-g43db1e03c086
+%define tarfile_release 6.10
 # This is needed to do merge window version magic
 %define patchlevel 10
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20240712git43db1e03c086.62%{?buildid}%{?dist}
+%define specrelease 64%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.10.0
 
@@ -4043,8 +4043,19 @@ fi\
 #
 #
 %changelog
-* Fri Jul 12 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc7.43db1e03c086.62]
-- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
+* Mon Jul 15 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-64]
+- Linux v6.10.0
+
+* Sun Jul 14 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc7.4d145e3f830b.63]
+- Consolidate configs to common for 6.10 (Justin M. Forbes)
+- Linux v6.10.0-0.rc7.4d145e3f830b
+
+* Sat Jul 13 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc7.528dd46d0fc3.62]
+- redhat/configs: Enable CONFIG_PTP_1588_CLOCK_MOCK in kernel-modules-internal (Davide Caratti)
+- fedora: enabled XE GPU drivers on all arches (Peter Robinson)
+- Flip SND_SOC_CS35L56_SPI from off to module for RHEL (Justin M. Forbes)
+- Flip DIMLIB from built-in to module for RHEL (Justin M. Forbes)
+- Linux v6.10.0-0.rc7.528dd46d0fc3
 
 * Fri Jul 12 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.10.0-0.rc7.43db1e03c086.61]
 - Linux v6.10.0-0.rc7.43db1e03c086
diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch
index 7cc3b4516..7a9f26e84 100644
--- a/patch-6.10-redhat.patch
+++ b/patch-6.10-redhat.patch
@@ -141,7 +141,7 @@ index 000000000000..7465c78a90e6
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index b25b5b44af10..57f5aed0475a 100644
+index 3d10e3aadeda..3e9b956aca7c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index b39004891..f45959cef 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.10-rc7-141-g43db1e03c086.tar.xz) = cce3ebdef5bd72b28f2898776fa67fcb23fc15400e5691636af895ec73b2d2d0dc280fda609bb91ae727a12fed06fb5f6e4c48c2109900d0a2e2491fe8a11e85
-SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 3940449f771872639ed208db26d4c52dd605de2ee74c49f11f4f32ceb2db8373b2dd6175da8d70bf9ad09eb997ad5103ed74e9d932f5c614fc194a7b8131dc27
-SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 71d43c5b6caf8c56438f88a23a601acde36d0897a30b4aabfe7a252a29784226d1b6d1f63354f395577611107c54b449e84050fbc14860cd5e212f248a4c77c3
+SHA512 (linux-6.10.tar.xz) = dab033d230f6d40e6f2c6e16f46e69085126abc4cd6c9afca3cc6e2e8b6ceb17db87da881744cd9558e3f5cc22a069ea9ccfd7136496c023b1506d6b91a69d5a
+SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = bd71af51698faaf4d97da5e25655c0424292adad20330766c923b4aa66bcf9891cf832c79c50df0f41bc7310d73752be91bd3e23017a24318b081f3b1be66a22
+SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 433f1c50ceb99d2816c5039ebc0a17b8c8086ba16e5ea4531611f950d12ba875255ff397fbe9cde06063ef5f21eb01415e24f3650dc5534daa71a2e1795164b3