diff --git a/Makefile.rhelver b/Makefile.rhelver index 9826d97f6..e3e32f88f 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 = 51 +RHEL_RELEASE = 52 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index dc2ebfd79..fed4a2ff6 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/783a1dcee8d9e06f7800b466a196777bf15e63d1 - 783a1dcee8d9e06f7800b466a196777bf15e63d1 tools/rtla: fix collision with glibc sched_attr/sched_set_attr +https://gitlab.com/cki-project/kernel-ark/-/commit/dc052a61b072f22311ae594a2efe156b684c7344 + dc052a61b072f22311ae594a2efe156b684c7344 tools/rtla: fix collision with glibc sched_attr/sched_set_attr -https://gitlab.com/cki-project/kernel-ark/-/commit/5e9a02a2c46ad648a8d3cca1d46397e0d5716e63 - 5e9a02a2c46ad648a8d3cca1d46397e0d5716e63 tools/rtla: drop __NR_sched_getattr +https://gitlab.com/cki-project/kernel-ark/-/commit/dc2b9983ffb53ae6193dd80a9786320be8b1d9a5 + dc2b9983ffb53ae6193dd80a9786320be8b1d9a5 tools/rtla: drop __NR_sched_getattr https://gitlab.com/cki-project/kernel-ark/-/commit/0756902dd6b52af5d02b221e5ea50565d31a50e7 0756902dd6b52af5d02b221e5ea50565d31a50e7 Update the RHEL_DIFFERENCES help string diff --git a/kernel.changelog b/kernel.changelog index 44e7bba69..79a997428 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,12 @@ -* Mon Nov 04 2024 Fedora Kernel Team [6.12.0-0.rc6.51] +* Tue Nov 05 2024 Fedora Kernel Team [6.12.0-0.rc6.2e1b3cc9d7f7.52] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) Resolves: +* Tue Nov 05 2024 Fedora Kernel Team [6.12.0-0.rc6.2e1b3cc9d7f7.51] +- Linux v6.12.0-0.rc6.2e1b3cc9d7f7 +Resolves: + * Mon Nov 04 2024 Fedora Kernel Team [6.12.0-0.rc6.50] - redhat/configs: add bootconfig to kernel-tools package (Brian Masney) - Enable CONFIG_SECURITY_LANDLOCK for RHEL (Zbigniew Jędrzejewski-Szmek) [RHEL-8810] diff --git a/kernel.spec b/kernel.spec index 50b554d3a..ed22ebdef 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.rc6.51 +%define pkgrelease 0.rc6.20241105git2e1b3cc9d7f7.52 %define kversion 6 -%define tarfile_release 6.12-rc6 +%define tarfile_release 6.12-rc6-77-g2e1b3cc9d7f7 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.51%{?buildid}%{?dist} +%define specrelease 0.rc6.20241105git2e1b3cc9d7f7.52%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -4152,10 +4152,13 @@ fi\ # # %changelog -* Mon Nov 04 2024 Fedora Kernel Team [6.12.0-0.rc6.51] +* Tue Nov 05 2024 Fedora Kernel Team [6.12.0-0.rc6.2e1b3cc9d7f7.52] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) +* Tue Nov 05 2024 Fedora Kernel Team [6.12.0-0.rc6.2e1b3cc9d7f7.51] +- Linux v6.12.0-0.rc6.2e1b3cc9d7f7 + * Mon Nov 04 2024 Fedora Kernel Team [6.12.0-0.rc6.50] - redhat/configs: add bootconfig to kernel-tools package (Brian Masney) - Enable CONFIG_SECURITY_LANDLOCK for RHEL (Zbigniew Jędrzejewski-Szmek) [RHEL-8810] diff --git a/sources b/sources index aa35d8968..ce4b74150 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12-rc6.tar.xz) = b31d939091ae017707fe7222d5700048eba927adaf00dac47b50971274b8aa74a70cd1e9de9ec723ce6072e101e4a89b9e95e6bf6d4bfd5646ddebae606a1e2c -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = b53c8b78979b2666488f3c41f3f721ec37c30ee253a2c6b7d2e6ae082491544153a2d44b51693a14de85350d0acb704b1fa900794a3a7b8b6410d788997d4b68 -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 2d6ddc7ca22e93679d3883ff6ae6fd43f4172850819968ee59a7bb3db5a08f2086b0ea51b95dae5d0faf0c70ce92c7216f803e2a01d51d50d0651e3c27c202b1 +SHA512 (linux-6.12-rc6-77-g2e1b3cc9d7f7.tar.xz) = ff149b6b4a0da4326569380331cdfc4d8119d98fc53ffd41d19fadbbbbd07454a951d938a48bf1698e740d2747b4810d5815c77e346987a56b5409b84bf15cf7 +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = e5918ebd66dc23b40abecc587761fff0d999b67b4acba7247f69d5a951cae5007f906f5c2ad44606db874c0a28de06ab7e5193854f9ecd53f3f16ee4c843b9ed +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 7f51917e47912f5342d183d8e77097022586048d0ec5fd2683ed5dd2151775619611e92b012973a06991b2d269f8053111e89b00861f4156a8ac713a7de25616