diff --git a/kernel.changelog b/kernel.changelog
index 1abb42a..2e4a35d 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,7 @@
+* Wed Sep 11 2024 Neal Gompa <ngompa@centosproject.org> [6.10.9-0.hs4]
+- redhat/kernel: fix macro infinite recursion issue (take 2) (Davide Cavalca)
+Resolves: 
+
 * Wed Sep 11 2024 Neal Gompa <ngompa@centosproject.org> [6.10.9-0.hs3]
 - redhat/kernel: fix macro infinite recursion issue (Davide Cavalca)
 Resolves: 
diff --git a/kernel.spec b/kernel.spec
index d0021f0..cc5bb5f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -159,19 +159,19 @@ Summary: The Linux kernel
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
-%define buildid 3
+%define buildid 4
 %define specrpmversion 6.10.9
 %define specversion 6.10.9
 %define patchversion 6.10
-%define pkgrelease 0.hs3
+%define pkgrelease 0.hs4
 %define kversion 6
-%define tarfile_release 6.10.9-0.hs3.el10
+%define tarfile_release 6.10.9-0.hs4.el10
 # This is needed to do merge window version magic
 %define patchlevel 10
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 0.hs%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.10.9-0.hs3.el10
+%define kabiversion 6.10.9-0.hs4.el10
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -2907,6 +2907,8 @@ fi
 
 %ifarch aarch64
 %global perf_build_extra_opts CORESIGHT=1
+%else
+%global perf_build_extra_opts %{nil}
 %endif
 %if 0%{?facebook}
 %global perf_build_extra_opts_ex %{perf_build_extra_opts} NO_LIBPERL=1
@@ -4061,6 +4063,9 @@ fi\
 #
 #
 %changelog
+* Wed Sep 11 2024 Neal Gompa <ngompa@centosproject.org> [6.10.9-0.hs4]
+- redhat/kernel: fix macro infinite recursion issue (take 2) (Davide Cavalca)
+
 * Wed Sep 11 2024 Neal Gompa <ngompa@centosproject.org> [6.10.9-0.hs3]
 - redhat/kernel: fix macro infinite recursion issue (Davide Cavalca)
 
diff --git a/sources b/sources
index b61b081..e2f3db1 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (kernel-abi-stablelists-6.10.9-0.hs3.el10.tar.xz) = ea0c2f773c264385419342fbf251c4be8b62cb744e286bd1332390bc6b45a87d08b5c33b96032374e1729ee00b8fa404268b283afd6e2026c328bbd0d2810653
-SHA512 (kernel-kabi-dw-6.10.9-0.hs3.el10.tar.xz) = 2c4eb0976ede8708ce71db8b5c11e43da6681ec4a4a81307b41785aadaa0d153f7cd30d3212bb0344494a9c4319eba2f5db0f9ae982dc4fe451d90fddcece274
-SHA512 (linux-6.10.9-0.hs3.el10.tar.xz) = 7eb5fbfee043da61fa7fae11f2712a201990727d5d6e9fc5de3dd02c5e179ebb4839fceae04b6e8f2bce8d4dc9782d80a6ff835b046cb8d16c4ad7a4219f9256
+SHA512 (kernel-abi-stablelists-6.10.9-0.hs4.el10.tar.xz) = 1e763c9920e0b0bca241daad1f6c601f5f9f9d5aa9214d988823d060c15ce440fb9bf9b5c61876c09d3b967635e8bbf9bccf9d71a09770672cd63b8d69ee15d6
+SHA512 (kernel-kabi-dw-6.10.9-0.hs4.el10.tar.xz) = 2c4eb0976ede8708ce71db8b5c11e43da6681ec4a4a81307b41785aadaa0d153f7cd30d3212bb0344494a9c4319eba2f5db0f9ae982dc4fe451d90fddcece274
+SHA512 (linux-6.10.9-0.hs4.el10.tar.xz) = 0229071cc96a5db1e7fc62390e7d99f08c2526421370bd976da19b1f434ffe22c2a07dd58462923a6a19fde95e865b3ea0b2002b6900b74d848f5c4c82830a97
 SHA512 (fedoraimaca.x509) = e04809394f4472c17e86d7024dee34f03fb68e82a85502fd5b00535202c72e57626a8376b2cf991b7e1e46404aa5ab8d189ebf320e0dd37d49e7efbc925c7a2e
 SHA512 (nvidiagpuoot001.x509) = b42f836e1cfa07890cb6ca13de9c3950e306c9ec7686c4c09f050bb68869f5d82962b2cd5f3aa0eb7a0f3a3ae54e9c480eafbac5df53aa92c295ff511a8c59fe
 SHA512 (rheldup3.x509) = ebf56d821acb5c17bb1842a8ddc8f1014a9e112ef7569531eedbabc82c6b5740e2709f96c5ebc87ba837e8085d0b090a9e63ddd06507692b41dae54a2b48d21b