diff --git a/Makefile.rhelver b/Makefile.rhelver
index 47598f6b1..96c4e2660 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 = 24
+RHEL_RELEASE = 25
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 81aaf45a4..3abb2358e 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1073,7 +1073,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -2334,7 +2334,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -2501,7 +2501,7 @@ CONFIG_FUSION_FC=m
 # CONFIG_FUSION is not set
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUTEX=y
@@ -3027,7 +3027,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 8f940ea6c..87d881e76 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -3174,13 +3174,12 @@ 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
 # CONFIG_MARVELL_88X2222_PHY is not set
 CONFIG_MARVELL_CN10K_DDR_PMU=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
+CONFIG_MARVELL_CN10K_TAD_PMU=m
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 30b6e1790..b7a75f1d2 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1073,7 +1073,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1666,7 +1666,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -2317,7 +2317,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -2484,7 +2484,7 @@ CONFIG_FUSION_FC=m
 # CONFIG_FUSION is not set
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUTEX=y
@@ -3010,7 +3010,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index b3dd593c0..254d0fa1f 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3153,13 +3153,12 @@ 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
 # CONFIG_MARVELL_88X2222_PHY is not set
 CONFIG_MARVELL_CN10K_DDR_PMU=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
+CONFIG_MARVELL_CN10K_TAD_PMU=m
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 9aab875f2..cbed4b809 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1065,7 +1065,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -2331,7 +2331,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -2479,7 +2479,7 @@ CONFIG_FUSION_FC=m
 # CONFIG_FUSION is not set
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUTEX=y
@@ -2986,7 +2986,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -3959,7 +3959,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index a4f8fc3da..bd6553f1a 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1065,7 +1065,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1623,7 +1623,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -2315,7 +2315,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -2463,7 +2463,7 @@ CONFIG_FUSION_FC=m
 # CONFIG_FUSION is not set
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUTEX=y
@@ -2970,7 +2970,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -3937,7 +3937,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index b3ed96973..91da86bfd 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1043,7 +1043,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -2285,7 +2285,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -2433,7 +2433,7 @@ CONFIG_FUSION_FC=m
 # CONFIG_FUSION is not set
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUTEX=y
@@ -2931,7 +2931,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -3883,7 +3883,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 529ba5ca0..fff80f3a6 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1043,7 +1043,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1592,7 +1592,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -2269,7 +2269,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -2417,7 +2417,7 @@ CONFIG_FUSION_FC=m
 # CONFIG_FUSION is not set
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUTEX=y
@@ -2915,7 +2915,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -3861,7 +3861,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index ea3b0a7a7..f362a96d8 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -814,7 +814,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1827,7 +1827,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -1977,7 +1977,7 @@ CONFIG_FUSION_CTL=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION=y
@@ -2434,7 +2434,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -3305,7 +3305,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 06fefa451..c352b618d 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2961,12 +2961,10 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MAILBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 # 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
 # CONFIG_MARVELL_88X2222_PHY is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index bfbc639ee..6cedbdbc9 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -812,7 +812,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1249,7 +1249,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -1808,7 +1808,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -1958,7 +1958,7 @@ CONFIG_FUSION_CTL=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION=y
@@ -2414,7 +2414,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -3279,7 +3279,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 7484339a7..e57fa76dd 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -2941,12 +2941,10 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MAILBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 # 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
 # CONFIG_MARVELL_88X2222_PHY is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 24dfeba50..4418df1fb 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -818,7 +818,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1834,7 +1834,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -1976,7 +1976,7 @@ CONFIG_FUSION_FC=m
 # CONFIG_FUSION is not set
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUTEX=y
@@ -2414,7 +2414,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -3285,7 +3285,6 @@ CONFIG_MARCH_Z13=y
 # CONFIG_MARCH_ZEC12 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index e589c7237..5282d1f70 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2940,7 +2940,6 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MAILBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 # CONFIG_MANAGER_SBS is not set
-CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z10 is not set
 # CONFIG_MARCH_Z13 is not set
@@ -2954,7 +2953,6 @@ CONFIG_MARCH_Z14=y
 # CONFIG_MARCH_ZEC12 is not set
 CONFIG_MARVELL_10G_PHY=m
 # CONFIG_MARVELL_88X2222_PHY is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 90d106953..356d2dbf2 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -816,7 +816,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1259,7 +1259,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -1815,7 +1815,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -1957,7 +1957,7 @@ CONFIG_FUSION_FC=m
 # CONFIG_FUSION is not set
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUTEX=y
@@ -2394,7 +2394,7 @@ CONFIG_ICP10100=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDLE_INJECT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
@@ -3259,7 +3259,6 @@ CONFIG_MARCH_Z13=y
 # CONFIG_MARCH_ZEC12 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index f3669e7cc..5977532a3 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2920,7 +2920,6 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MAILBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 # CONFIG_MANAGER_SBS is not set
-CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z10 is not set
 # CONFIG_MARCH_Z13 is not set
@@ -2934,7 +2933,6 @@ CONFIG_MARCH_Z14=y
 # CONFIG_MARCH_ZEC12 is not set
 CONFIG_MARVELL_10G_PHY=m
 # CONFIG_MARVELL_88X2222_PHY is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index ed8b3272c..6d027f217 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2932,7 +2932,6 @@ CONFIG_MAGIC_SYSRQ_SERIAL=y
 # CONFIG_MAILBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 # CONFIG_MANAGER_SBS is not set
-CONFIG_MANA_INFINIBAND=m
 CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z10 is not set
 # CONFIG_MARCH_Z13 is not set
@@ -2946,7 +2945,6 @@ CONFIG_MARCH_Z14=y
 # CONFIG_MARCH_ZEC12 is not set
 CONFIG_MARVELL_10G_PHY=m
 # CONFIG_MARVELL_88X2222_PHY is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index ca379bbd4..42b9791b0 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -59,7 +59,7 @@ CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_DPTF=y
 CONFIG_ACPI_EC_DEBUGFS=m
-# CONFIG_ACPI_EXTLOG is not set
+CONFIG_ACPI_EXTLOG=m
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
@@ -870,7 +870,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1888,8 +1888,8 @@ CONFIG_EFI_STUB=y
 CONFIG_EFI_TEST=m
 CONFIG_EFIVAR_FS=y
 # CONFIG_EFI_VARS is not set
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-# CONFIG_EFI_VARS_PSTORE is not set
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
 CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
@@ -2001,7 +2001,7 @@ CONFIG_FAULT_INJECTION=y
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -2045,7 +2045,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
-# CONFIG_FB_VESA is not set
+CONFIG_FB_VESA=y
 # CONFIG_FB_VGA16 is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -2147,7 +2147,7 @@ CONFIG_FUSION_CTL=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION=y
@@ -2633,7 +2633,7 @@ CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_IDLE_INJECT=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IE6XX_WDT=m
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
@@ -3592,7 +3592,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
@@ -4144,7 +4143,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTK_T7XX=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index ab5735ff6..27fd3cd8c 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -3137,7 +3137,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 # CONFIG_MARVELL_88X2222_PHY is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index e8044a5cc..5a092b436 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -59,7 +59,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_DPTF=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
-# CONFIG_ACPI_EXTLOG is not set
+CONFIG_ACPI_EXTLOG=m
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
@@ -868,7 +868,7 @@ CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
 # CONFIG_CHARGER_ADP5061 is not set
@@ -1360,7 +1360,7 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_PLIST is not set
-CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_RODATA_TEST=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_RWSEMS is not set
@@ -1877,8 +1877,8 @@ CONFIG_EFI_STUB=y
 CONFIG_EFI_TEST=m
 CONFIG_EFIVAR_FS=y
 # CONFIG_EFI_VARS is not set
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-# CONFIG_EFI_VARS_PSTORE is not set
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI=y
 CONFIG_EFI_ZBOOT=y
 # CONFIG_EFS_FS is not set
@@ -1982,7 +1982,7 @@ CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HGA is not set
@@ -2026,7 +2026,7 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_UVESA is not set
-# CONFIG_FB_VESA is not set
+CONFIG_FB_VESA=y
 # CONFIG_FB_VGA16 is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -2128,7 +2128,7 @@ CONFIG_FUSION_CTL=m
 CONFIG_FUSION_FC=m
 CONFIG_FUSION_LAN=m
 CONFIG_FUSION_LOGGING=y
-CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_MAX_SGE=128
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION=y
@@ -2613,7 +2613,7 @@ CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
 CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_IDLE_INJECT=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_IE6XX_WDT=m
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_ADF7242=m
@@ -3566,7 +3566,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
@@ -4118,7 +4117,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTK_T7XX=m
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 673520438..49cc8450b 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -3117,7 +3117,6 @@ CONFIG_MANTIS_CORE=m
 # CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 # CONFIG_MARVELL_88X2222_PHY is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_MARVELL_PHY=m
 # CONFIG_MATOM is not set
 # CONFIG_MAX1027 is not set
diff --git a/kernel.spec b/kernel.spec
index bbbbc86eb..507d1b4ab 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -148,13 +148,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.4.0
 %define specversion 6.4.0
 %define patchversion 6.4
-%define pkgrelease 0.rc2.20230518git4d6d4c7f541d.24
+%define pkgrelease 0.rc2.20230519git2d1bcbc6cd70.25
 %define kversion 6
-%define tarfile_release 6.4-rc2-18-g4d6d4c7f541d
+%define tarfile_release 6.4-rc2-163-g2d1bcbc6cd70
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20230518git4d6d4c7f541d.24%{?buildid}%{?dist}
+%define specrelease 0.rc2.20230519git2d1bcbc6cd70.25%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.4.0
 
@@ -3415,6 +3415,14 @@ fi
 #
 #
 %changelog
+* Fri May 19 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc2.2d1bcbc6cd70.25]
+- redhat/configs: turn on CONFIG_MARVELL_CN10K_TAD_PMU (Michal Schmidt) [2042240]
+- redhat/configs: Fix enabling MANA Infiniband (Kamal Heib)
+- Fix file listing for symvers in uki (Justin M. Forbes)
+- Fix up some Fedora config items (Justin M. Forbes)
+- enable efifb for Nvidia (Justin M. Forbes)
+- Linux v6.4.0-0.rc2.2d1bcbc6cd70
+
 * Thu May 18 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc2.4d6d4c7f541d.24]
 - kernel.spec: package unstripped test_progs-no_alu32 (Felix Maurer)
 - Turn on NFT_CONNLIMIT for Fedora (Justin M. Forbes)
diff --git a/sources b/sources
index a015d950d..f1daf259e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.4-rc2-18-g4d6d4c7f541d.tar.xz) = fa2237cc52437b296e0bbcc0923cd77ab4b4f55377ebf242cd4ee31737b9e4390a691a7a999cd111f3d8bb6c5b34d6b06c3bf5a4df49780c6535ebd5de055ad6
-SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 4e7bcce843507dbade2e4b144bada81e3ea359836bfe3b0852515223bb88c0063e8f50510eb0924796b219eb3abd0ade5031a0c034acf24c267d2e941109e7b9
-SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 278b4fa9e288bf82f3ad669603293361560cda3cdb1b1aad687026151aa5d6f49b001467dc932cc378e75f0340d6a205a4f797a7a0e7021c2bdabfe91e0d2bf6
+SHA512 (linux-6.4-rc2-163-g2d1bcbc6cd70.tar.xz) = 8a731252e7cda7fd7f38b33cdef9de5df7b3420b7503b9d8745fcc3e25080a1a9d257fd028139f5ece2cbf234f9b9949b4c414951812024e5dde34289e7eb677
+SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = f56bafeb7c09e0fcaac0d49fec708ba90882f08a0420b146d3f4a6c995c67f8bfbfde42e42b60d34f68f9562571899291bf2326429bbf86483959b56f4c5dcf7
+SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = c26e0955231218bd2a482893a6d4913b6176afe55b04554ce59b7e524d063fb5e31a57a8d3c7ae8062a344ef83b8f1f49b6828340fe035efd6721a8a0d5356fa