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-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index 4fb6b3841..c9bb72012 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -1911,7 +1911,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 CONFIG_DMA_OF=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index 4f6f745e2..908f15a83 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -1902,7 +1902,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 CONFIG_DMA_OF=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 94c835a3a..39b45fa48 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -204,7 +204,7 @@ CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_TEGRA is not set
 CONFIG_AHCI_XGENE=m
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1504,7 +1504,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2643,7 +2643,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 1c4c2eca8..d4a3c49ea 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -204,7 +204,7 @@ CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_TEGRA is not set
 CONFIG_AHCI_XGENE=m
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1496,7 +1496,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2627,7 +2627,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index ef51cef62..7e631c830 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1911,7 +1911,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 CONFIG_DMA_OF=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 33103832a..9870c534a 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -204,7 +204,7 @@ CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_TEGRA is not set
 CONFIG_AHCI_XGENE=m
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1502,7 +1502,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2640,7 +2640,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 406474ada..df552a3d2 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1902,7 +1902,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 CONFIG_DMA_OF=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index d98688475..06ec94603 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -204,7 +204,7 @@ CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_TEGRA is not set
 CONFIG_AHCI_XGENE=m
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1494,7 +1494,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2624,7 +2624,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 1b7a83cf6..04a80c9f3 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -204,7 +204,7 @@ CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_TEGRA is not set
 CONFIG_AHCI_XGENE=m
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1504,7 +1504,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2681,7 +2681,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 708e964e1..e6535ec55 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -204,7 +204,7 @@ CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_TEGRA is not set
 CONFIG_AHCI_XGENE=m
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1496,7 +1496,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2665,7 +2665,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c835bd931..72510d4fa 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2563,7 +2563,7 @@ CONFIG_I2C_CP2615=m
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 6860d567e..4f11dd875 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -195,7 +195,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AHCI_DWC is not set
 # CONFIG_AHCI_QORIQ is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -2349,7 +2349,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 6b2d9d217..aaafec46a 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2544,7 +2544,7 @@ CONFIG_I2C_CP2615=m
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 3dc04acef..d89a8f054 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -195,7 +195,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AHCI_DWC is not set
 # CONFIG_AHCI_QORIQ is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -2333,7 +2333,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index fade5c789..bc08c2739 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -2578,7 +2578,7 @@ CONFIG_I2C_CP2615=m
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index f149b5c80..c8fab5e91 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -2559,7 +2559,7 @@ CONFIG_I2C_CP2615=m
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 2f178e897..90623053a 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2543,7 +2543,7 @@ CONFIG_I2C_CP2615=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_CORE is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index f460783e0..fa7c439ae 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -193,7 +193,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_DWC is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -2340,7 +2340,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
 # CONFIG_I2C_DESIGNWARE_CORE is not set
 # CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
 # CONFIG_I2C_EMEV2 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index cb2d82ab5..de0b55a1d 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2524,7 +2524,7 @@ CONFIG_I2C_CP2615=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_CORE is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
+CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 08b6f7414..791d76d08 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -193,7 +193,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_DWC is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -2324,7 +2324,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
 # CONFIG_I2C_DESIGNWARE_CORE is not set
 # CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
 # CONFIG_I2C_EMEV2 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 83016a766..f78ab6aa1 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -193,7 +193,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_DWC is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -2330,7 +2330,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
 # CONFIG_I2C_DESIGNWARE_CORE is not set
 # CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
 # CONFIG_I2C_EMEV2 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index f8acd6715..88bc4aa9a 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1557,7 +1557,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 18ae1370d..ddd888f8e 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -210,7 +210,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_DWC is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1352,7 +1352,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2498,7 +2498,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 1594b1968..306652351 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1546,7 +1546,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index a948032a6..2710c51f8 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -210,7 +210,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_DWC is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1344,7 +1344,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2482,7 +2482,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 64d03104f..177c6d482 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -210,7 +210,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_DWC is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1354,7 +1354,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2539,7 +2539,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index f12517452..98eff8222 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -210,7 +210,7 @@ CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_DWC is not set
 CONFIG_AIO=y
-# CONFIG_AIR_EN8811H_PHY is not set
+CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
@@ -1346,7 +1346,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-# CONFIG_DMA_NUMA_CMA is not set
+CONFIG_DMA_NUMA_CMA=y
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2523,7 +2523,7 @@ CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEMUX_PINCTRL is not set
 # CONFIG_I2C_DESIGNWARE_AMDPSP is not set
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-# CONFIG_I2C_DESIGNWARE_CORE is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
diff --git a/kernel.changelog b/kernel.changelog
index 392f4aae1..0c74b8b1c 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,14 @@
+* Tue Oct 08 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc2.87d6aab2389e.25]
+- configs: rhel: Fix designware I2C controllers related config settings (Hans de Goede)
+- Enable CONFIG_DMA_NUMA_CMA for x86_64 and aarch64 (Chris von Recklinghausen)
+- new config in drivers/phy (Izabela Bakollari)
+- configs: fedora: Unset CONFIG_I2C_DESIGNWARE_CORE on s390x (Hans de Goede)
+- configs: fedora: Drop duplicate CONFIG_I2C_DESIGNWARE_CORE for x86_64 and aarch64 (Hans de Goede)
+- Enable DESIGNWARE_CORE for ppc as well (Justin M. Forbes)
+- Fix up I2C_DESIGNWARE_CORE config for Fedora (Justin M. Forbes)
+- Linux v6.12.0-0.rc2.87d6aab2389e
+Resolves: 
+
 * Mon Oct 07 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc2.24]
 - Linux v6.12.0-0.rc2
 Resolves: 
diff --git a/kernel.spec b/kernel.spec
index a1154d55d..a5a6aca04 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.rc2.24
+%define pkgrelease 0.rc2.20241008git87d6aab2389e.25
 %define kversion 6
-%define tarfile_release 6.12-rc2
+%define tarfile_release 6.12-rc2-6-g87d6aab2389e
 # This is needed to do merge window version magic
 %define patchlevel 12
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.24%{?buildid}%{?dist}
+%define specrelease 0.rc2.20241008git87d6aab2389e.25%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.12.0
 
@@ -4136,6 +4136,16 @@ fi\
 #
 #
 %changelog
+* Tue Oct 08 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc2.87d6aab2389e.25]
+- configs: rhel: Fix designware I2C controllers related config settings (Hans de Goede)
+- Enable CONFIG_DMA_NUMA_CMA for x86_64 and aarch64 (Chris von Recklinghausen)
+- new config in drivers/phy (Izabela Bakollari)
+- configs: fedora: Unset CONFIG_I2C_DESIGNWARE_CORE on s390x (Hans de Goede)
+- configs: fedora: Drop duplicate CONFIG_I2C_DESIGNWARE_CORE for x86_64 and aarch64 (Hans de Goede)
+- Enable DESIGNWARE_CORE for ppc as well (Justin M. Forbes)
+- Fix up I2C_DESIGNWARE_CORE config for Fedora (Justin M. Forbes)
+- Linux v6.12.0-0.rc2.87d6aab2389e
+
 * Mon Oct 07 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc2.24]
 - Linux v6.12.0-0.rc2
 
diff --git a/sources b/sources
index 07d00733e..bc5c7ac8d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.12-rc2.tar.xz) = 0161956c6031a9c21032ff3dba47ca1428e2e001e4476a6a069048350b84631a4309ffb64e6419ca6bfb359824926457dcae6715e3d4fc2de48589176b90546c
-SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = a061172bb9393006b87b149d3fbcd3b649d9fe153731ff8d4d526ebf234753467958ddbb3b0e245f8c2b977c70a6dc662be007d49c5e047f8ec644129d877021
-SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 542c488dd7ba14c66085453a4af271753c8a43ad8064f7dd07e24fea5ccb40ce1ee7cb7586d41593b999aa277bb12729afce309e89f1bae141fa0dae7d72c9fd
+SHA512 (linux-6.12-rc2-6-g87d6aab2389e.tar.xz) = fe80ba29b9536c3a96257fa8d85c6c484498e0d438486acf8e0017b2301233bfd9a3a7346741f990d756d588040c8054e2eb6138ff300ef3fc39a84d69d884c1
+SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 47b8fe28721c46095be9b87f09d45880ded186cf87213c9bb6484ef997fdaade0f8e0765137dd116997c19d827cf6f135f772816c4963b24173d887a559daedf
+SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 128f61ec53155f4b91620376eef8551a21cc5785c9787e375806d43b09b69a1d8bea14c2c47ac49e409563eb93535ac8b6c3b542f2df4e142ca95bf4f9dcc2aa