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-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 5ef174422..e7507455a 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -2309,7 +2309,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 9d0ac9eec..4d7d98da7 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -2293,7 +2293,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 364421f80..027071eb2 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2866,7 +2866,7 @@ CONFIG_HP_WATCHDOG=m
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 89d363f49..4ee333f2a 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2305,7 +2305,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 43cdb68c7..5ef25492c 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2849,7 +2849,7 @@ CONFIG_HP_WATCHDOG=m
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 68b847222..8ef8da652 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2289,7 +2289,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index e22e17ba8..1af7a8b7c 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -2395,7 +2395,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 68635c181..11654af28 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -2379,7 +2379,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 265fa9aae..66a2cbd39 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2826,7 +2826,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 263b10bab..602470003 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2810,7 +2810,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 26b3e4972..b5653ccfd 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2774,7 +2774,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 4d906119b..1d158da82 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2758,7 +2758,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 0eb4870a0..8fbba6359 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2296,7 +2296,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index c721b067b..65c837798 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2054,7 +2054,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index fb3ee72e5..738a4e2cf 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2277,7 +2277,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 1ccecd515..16ca3b7be 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -2038,7 +2038,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index d34cc8dc7..b837da04d 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2288,7 +2288,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index b6a2055e0..e08ba135f 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2053,7 +2053,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index b4e1fc110..1949863c2 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2269,7 +2269,7 @@ CONFIG_HOTPLUG_PCI=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HSU_DMA is not set
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 9e08d08af..ba8c3d591 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2037,7 +2037,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index a40a501ae..fe02ec34e 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2488,7 +2488,7 @@ CONFIG_HP_WMI=m
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 CONFIG_HSU_DMA=y
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 715a80686..5b20d3117 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -2186,7 +2186,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 42175fa26..312250e80 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2469,7 +2469,7 @@ CONFIG_HP_WMI=m
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 CONFIG_HSU_DMA=y
 CONFIG_HT16K33=m
 # CONFIG_HTC_EGPIO is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 972a66cee..d1c84fd32 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -2170,7 +2170,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 6ae7c26f0..70bda5845 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -2277,7 +2277,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index 606313c96..34b61c63b 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -2261,7 +2261,7 @@ CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
 CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
-# CONFIG_HSR is not set
+CONFIG_HSR=m
 # CONFIG_HT16K33 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HTC_PASIC3 is not set
diff --git a/kernel.spec b/kernel.spec
index af988769e..07d0df464 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -174,13 +174,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.5.0
 %define specversion 6.5.0
 %define patchversion 6.5
-%define pkgrelease 0.rc3.20230725git0b5547c51827.24
+%define pkgrelease 0.rc3.20230726git18b44bc5a672.25
 %define kversion 6
-%define tarfile_release 6.5-rc3-18-g0b5547c51827
+%define tarfile_release 6.5-rc3-24-g18b44bc5a672
 # This is needed to do merge window version magic
 %define patchlevel 5
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20230725git0b5547c51827.24%{?buildid}%{?dist}
+%define specrelease 0.rc3.20230726git18b44bc5a672.25%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.5.0
 
@@ -3740,6 +3740,12 @@ fi\
 #
 #
 %changelog
+* Wed Jul 26 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc3.18b44bc5a672.25.el127]
+- redhat/scripts/rh-dist-git.sh: print list of uploaded files (Denys Vlasenko)
+- redhat/scripts/expand_srpm.sh: add missing function, robustify (Denys Vlasenko)
+- redhat: Enable HSR and PRP (Felix Maurer)
+- Linux v6.5.0-0.rc3.18b44bc5a672
+
 * Tue Jul 25 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc3.0b5547c51827.24.el127]
 - redhat/scripts/rh-dist-git.sh: fix outdated message and comment (Denys Vlasenko)
 - redhat/configs: Disable CONFIG_I8K (Prarit Bhargava)
diff --git a/sources b/sources
index b7d2560c6..1558c2153 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.5-rc3-18-g0b5547c51827.tar.xz) = 2ef197fe7cfdd98269770fd1e4d2e5c06ddd5b27a046f1fb1b2a33c16a1c141a436901235d1b9b67c188ead411ffe9c93d7e5a56f907a902cb60e9b1eb5418a1
-SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = f65e019c152023bc49c7eec16e01e5233e4774b1d6765ae4455c4d3810432c86c531524473d5a8410b2cfe682092958822612113a831f0382beea6d814554a54
-SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 2a93db19f2fbfcd5228dc9020d0c7f135ba437166fa4d561e833fd6c58a564f8c098d1b64687e954172f35c2e09c73be7deb2a5b8214718882d384ee38aaf8d5
+SHA512 (linux-6.5-rc3-24-g18b44bc5a672.tar.xz) = 6498cc054e8b06434c73f7046d2a1c971858c47ded32ec1216c6069172770a6a8b96aeff7661a067a5cdc0843730a24b6c737ad1d4f51a035149340d6c156f76
+SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 27d486c7068d1057015f5109a105ac2c119e865460d9b6a95f6c7857961f71181cc8949624ea9d0a6f51623390699540943d453f05e2d7deccc1306afa8d4b51
+SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 3e5e10071bdd2ed35503b0c5ca013dbf91fe3980761db1cf07c6df8fe613375f89f0efc84be7eff25d02f1c1e7191bbe6ae7f641448e79977400bfc10096ca31