diff --git a/Makefile.rhelver b/Makefile.rhelver
index 2d7ebf11e..bae58f2f3 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
 
 #
 # ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 4a2e09eb1..c42a456af 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,8 +1,8 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/f41ceac0577068e8fbca14e8ffa6a20b1a224355
- f41ceac0577068e8fbca14e8ffa6a20b1a224355 kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/0641cd94fda4ba3dd9ab86c4357d1dd2b388a8f6
+ 0641cd94fda4ba3dd9ab86c4357d1dd2b388a8f6 kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes
 
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/f4c6ecf081ec0b529479e57d6575a05a2058453c
- f4c6ecf081ec0b529479e57d6575a05a2058453c redhat: version two of Makefile.rhelver tweaks
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/18fd02577f89104ff52b7f0933f0f5b0365602b7
+ 18fd02577f89104ff52b7f0933f0f5b0365602b7 redhat: version two of Makefile.rhelver tweaks
 
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/7bfeffd1d37b3bc7d86247c53843762b4e97c62b
  7bfeffd1d37b3bc7d86247c53843762b4e97c62b redhat:  adapt to upstream Makefile change
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index f1ce52e79..061b1988e 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -2509,8 +2509,8 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 30bf63b1c..59851388a 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1928,8 +1928,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 1aabc2e8b..2ded9b3bc 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -2493,8 +2493,8 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index b30c6619d..e9e83c4f3 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1912,8 +1912,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index ff7e39b9b..6c85e9978 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -2490,8 +2490,8 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GEHC_ACHC is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 5d09c1a42..0edc38a03 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -2475,8 +2475,8 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GEHC_ACHC is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 137413cce..d63241507 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2444,8 +2444,8 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GEHC_ACHC is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index f63eec68b..57d64c9e6 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2429,8 +2429,8 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GEHC_ACHC is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c6616421a..9629dce1e 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1992,8 +1992,8 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index cd858a5f3..4da1b0e60 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1749,8 +1749,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 98d3d0936..aa8501953 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1975,8 +1975,8 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index fa0710978..30f2aa87e 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1733,8 +1733,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 43d919ba2..8ad33ec75 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1990,8 +1990,8 @@ CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2c8371b95..5775938a3 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1753,8 +1753,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 340d8722a..5af7d8c84 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1973,8 +1973,8 @@ CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index af65bccbf..910a57b22 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1737,8 +1737,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 5df3e29ad..afed1a2f4 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1744,8 +1744,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index d21e3a9c3..9ffcb5d2c 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2160,8 +2160,8 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 9c7b3eaff..f5e1d02dd 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1861,8 +1861,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index b5d19d22b..7923cba24 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2143,8 +2143,8 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 8d8d68778..31c01e433 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1845,8 +1845,8 @@ CONFIG_GACT_PROB=y
 # CONFIG_GART_IOMMU is not set
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
-CONFIG_GCC_PLUGINS=y
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
diff --git a/kernel.spec b/kernel.spec
index d4b859757..b7e82a878 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -143,13 +143,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.3.0
 %define patchversion 6.3
-%define pkgrelease 0.rc2.20230314gitfc89d7fb499b.24
+%define pkgrelease 0.rc2.20230315git6015b1aca1a2.25
 %define kversion 6
-%define tarfile_release 6.3-rc2-6-gfc89d7fb499b
+%define tarfile_release 6.3-rc2-47-g6015b1aca1a2
 # This is needed to do merge window version magic
 %define patchlevel 3
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20230314gitfc89d7fb499b.24%{?buildid}%{?dist}
+%define specrelease 0.rc2.20230315git6015b1aca1a2.25%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.3.0
 
@@ -3362,10 +3362,14 @@ fi
 #
 #
 %changelog
-* Tue Mar 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.fc89d7fb499b.24]
+* Wed Mar 15 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.6015b1aca1a2.25]
 - kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes (Marco Elver)
 - redhat: version two of Makefile.rhelver tweaks (Clark Williams)
 
+* Wed Mar 15 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.6015b1aca1a2.24]
+- redhat/configs: Disable CONFIG_GCC_PLUGINS (Prarit Bhargava)
+- Linux v6.3.0-0.rc2.6015b1aca1a2
+
 * Tue Mar 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.fc89d7fb499b.23]
 - redhat/kernel.spec.template: Fix typo for process_configs.sh call (Neal Gompa)
 - redhat/configs: CONFIG_CRYPTO_SM3_AVX_X86_64 is x86 only (Vladis Dronov)
diff --git a/patch-6.3-redhat.patch b/patch-6.3-redhat.patch
index f919cadcf..cf34bf194 100644
--- a/patch-6.3-redhat.patch
+++ b/patch-6.3-redhat.patch
@@ -1,7 +1,7 @@
  Documentation/admin-guide/kernel-parameters.txt    |   9 +
  Kconfig                                            |   2 +
  Kconfig.redhat                                     |  17 +
- Makefile                                           |  16 +-
+ Makefile                                           |  20 +-
  arch/arm/Kconfig                                   |   4 +-
  arch/arm64/Kconfig                                 |   3 +-
  arch/arm64/kernel/acpi.c                           |   4 +
@@ -67,7 +67,7 @@
  security/lockdown/Kconfig                          |  13 +
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 69 files changed, 1563 insertions(+), 196 deletions(-)
+ 69 files changed, 1567 insertions(+), 196 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 index 6221a1d057dd..90c169923eda 100644
@@ -123,13 +123,17 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index c933ceb4f21d..6f9a92dee6fe 100644
+index c933ceb4f21d..76949a7c7475 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -22,6 +22,14 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
+@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
  PHONY := __all
  __all:
 
++# Set RHEL variables
++# Note that this ifdef'ery is required to handle when building with
++# the O= mechanism (relocate the object file results) due to upstream
++# commit 67d7c302 which broke our RHEL include file
 +ifneq ($(realpath source),)
 +include $(realpath source)/Makefile.rhelver
 +else
@@ -141,7 +145,7 @@ index c933ceb4f21d..6f9a92dee6fe 100644
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
-@@ -1335,7 +1343,13 @@ define filechk_version.h
+@@ -1335,7 +1347,13 @@ define filechk_version.h
  	((c) > 255 ? 255 : (c)))';                                       \
  	echo \#define LINUX_VERSION_MAJOR $(VERSION);                    \
  	echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL);            \
diff --git a/sources b/sources
index 2da02d638..5f3b848a9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.3-rc2-6-gfc89d7fb499b.tar.xz) = 60f187af2bc34ee83ee7815208ffa85e235de3147f37c7cf2f3ad20d358f315a874daea1fc722bd68d12f974a6909dca7c6561d73a04e848c0d2ad00b2347792
-SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = f6090ff59ed26447da9eb3936e28a59b3416402fa328417e1d89c6fde4f3217c347886b537f33fec9c3d4035ffa89da1ee8192b1b6544d8b5eb31fd81d29b261
-SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = d25a6f16095f25aa3b86874892fa4f5fd1e2f83865409193b9c34b00d353b37943b4d7fc821738aacc150982ca93564d94d120e5e886e7ebd2872fe1dc39c9a9
+SHA512 (linux-6.3-rc2-47-g6015b1aca1a2.tar.xz) = 80f8e66cbd941b81448666c0bdca2acf7534a1fcb2adee81fca259d8dde1bfec69712fa2854b9fe5d5e2b60c0e9fefcac566835ac479419a1ee37f97c101ff68
+SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 1ac31d9f3c03a47663e2732ed371366e847cbdfc3bba9c07f37f930e2e90eb7f57fea36fae6feb072815894eccedc88b537c264d9f60c8bc61e0c60366d93cd0
+SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = a590a628fa3e498391c41f1ca671debb7f6febf0d6816cb4f5bdc2fb773ac4f5e7c9219ea7d733b9d267cb5145f1baa6b49e5eb4324954e10933bf8d01f0f731