diff --git a/Makefile.rhelver b/Makefile.rhelver index e3e32f88f..045195d74 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 = 52 +RHEL_RELEASE = 53 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 96a708655..8066a6ec4 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] +- Linux v6.11.0-0.rc6.b831f83e40a2 +Resolves: + * Thu Sep 05 2024 Fedora Kernel Team [6.11.0-0.rc6.c763c4339688.52] - Linux v6.11.0-0.rc6.c763c4339688 Resolves: diff --git a/kernel.spec b/kernel.spec index 230654d2b..fd1aff7d7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc6.20240905gitc763c4339688.52 +%define pkgrelease 0.rc6.20240906gitb831f83e40a2.53 %define kversion 6 -%define tarfile_release 6.11-rc6-70-gc763c4339688 +%define tarfile_release 6.11-rc6-183-gb831f83e40a2 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240905gitc763c4339688.52%{?buildid}%{?dist} +%define specrelease 0.rc6.20240906gitb831f83e40a2.53%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4111,6 +4111,9 @@ fi\ # # %changelog +* Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] +- Linux v6.11.0-0.rc6.b831f83e40a2 + * Thu Sep 05 2024 Fedora Kernel Team [6.11.0-0.rc6.c763c4339688.52] - Linux v6.11.0-0.rc6.c763c4339688 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index b487ce9d0..c1a968dda 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -193,7 +193,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index d57cfc6896b8..1dd324956fcd 100644 +index b1f3bf584d4a..6b7bbf0c3e2e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -233,7 +233,7 @@ index d57cfc6896b8..1dd324956fcd 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1241,7 +1264,13 @@ define filechk_version.h +@@ -1242,7 +1265,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -248,7 +248,7 @@ index d57cfc6896b8..1dd324956fcd 100644 endef $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) -@@ -1848,6 +1877,23 @@ endif +@@ -1849,6 +1878,23 @@ endif ifdef CONFIG_MODULES diff --git a/sources b/sources index 8586e6f79..088e1ec3d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc6-70-gc763c4339688.tar.xz) = 4a847d7a42592ee9f04958e590f9b811f2a5d6e4c359d6c17e030184ec4ead443dfc0c5a830d8bebd608fb3458af6c5310fe920842970440a54a5a562df1f891 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = e11114e5dc08af328420b305fb19dbdb5c41758970ddedfa0707a427c7a396fc1bb4dc3b8672bc5022c92b6ba4465904fc77df546f1e3e916ff4c2c50d016dc7 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 586b0d6c5e9bba427211efb246b1b997cfada61fbd41c9479a839a46ec03a855e354db62e5233e45e87035ad6b9433c438da1074d720d2e3b8f1c611271ff0d6 +SHA512 (linux-6.11-rc6-183-gb831f83e40a2.tar.xz) = b5d123a82ea43f460217c8f0ed2a9a5830d844a51472ca4e6bce3c8e877b0155ada5b973d532e87054d014b2c494522719ed3aea731f6072b9e30e0cf533bd68 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = f9069aaf538a472c8c8bed53eeb4c982982201034e50bf479ffe2574aec7825479b9ca01f3d6758a0d92655ad4ebf5ce0d6ad09bc7c074625c64b7a1e2ca1bc6 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = e558790f22d6879d9006ea59634a93af465c94c4ae2587f1b9d14c5f62f52cadedd62b30e100d528ea44bb7479ed72c3a6b4983627a3f53ff9584fd3164d8dc6