diff --git a/Makefile.rhelver b/Makefile.rhelver index e266cc0cd..939753a00 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 = 44 +RHEL_RELEASE = 45 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 041f1016a..c5f236007 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/0abe3aa5d169760d48cb467ae2db7d3f13a9e91a - 0abe3aa5d169760d48cb467ae2db7d3f13a9e91a tools/rtla: fix collision with glibc sched_attr/sched_set_attr +https://gitlab.com/cki-project/kernel-ark/-/commit/e85f363e7671d47ae62509af738fb62386cf4300 + e85f363e7671d47ae62509af738fb62386cf4300 tools/rtla: fix collision with glibc sched_attr/sched_set_attr -https://gitlab.com/cki-project/kernel-ark/-/commit/864c24b0348362f81682037a1cfe7e9999221a7d - 864c24b0348362f81682037a1cfe7e9999221a7d tools/rtla: drop __NR_sched_getattr +https://gitlab.com/cki-project/kernel-ark/-/commit/e922ed0e32055c5061c9660acebd510bde5163bc + e922ed0e32055c5061c9660acebd510bde5163bc tools/rtla: drop __NR_sched_getattr https://gitlab.com/cki-project/kernel-ark/-/commit/77e6d045cb6220934aef9b192b291466fd205d21 77e6d045cb6220934aef9b192b291466fd205d21 Revert "Merge branch 'drop_engine_api' into 'os-build'" diff --git a/kernel.changelog b/kernel.changelog index 59dd055e9..b3cf6fb0b 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,12 @@ -* Mon Oct 28 2024 Fedora Kernel Team [6.12.0-0.rc5.44] +* Tue Oct 29 2024 Fedora Kernel Team [6.12.0-0.rc5.e42b1a9a2557.45] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) Resolves: +* Tue Oct 29 2024 Fedora Kernel Team [6.12.0-0.rc5.e42b1a9a2557.44] +- Linux v6.12.0-0.rc5.e42b1a9a2557 +Resolves: + * Mon Oct 28 2024 Fedora Kernel Team [6.12.0-0.rc5.43] - generic: enable RPMB for all configs that enable MMC (Peter Robinson) - fedora: riscv: Don't override MMC platform defaults (Peter Robinson) diff --git a/kernel.spec b/kernel.spec index 2cbcacf15..631153b32 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.rc5.44 +%define pkgrelease 0.rc5.20241029gite42b1a9a2557.45 %define kversion 6 -%define tarfile_release 6.12-rc5 +%define tarfile_release 6.12-rc5-5-ge42b1a9a2557 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.44%{?buildid}%{?dist} +%define specrelease 0.rc5.20241029gite42b1a9a2557.45%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -4136,10 +4136,13 @@ fi\ # # %changelog -* Mon Oct 28 2024 Fedora Kernel Team [6.12.0-0.rc5.44] +* Tue Oct 29 2024 Fedora Kernel Team [6.12.0-0.rc5.e42b1a9a2557.45] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) +* Tue Oct 29 2024 Fedora Kernel Team [6.12.0-0.rc5.e42b1a9a2557.44] +- Linux v6.12.0-0.rc5.e42b1a9a2557 + * Mon Oct 28 2024 Fedora Kernel Team [6.12.0-0.rc5.43] - generic: enable RPMB for all configs that enable MMC (Peter Robinson) - fedora: riscv: Don't override MMC platform defaults (Peter Robinson) diff --git a/sources b/sources index bf3adeac6..cb683be87 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12-rc5.tar.xz) = 67934c218e65b946d7a6849bb161a02d80e2191c8b34045582399e4fb4ad870ee0b30ac7cc3e197b75bcffff85b50ae447272d686c5e5b4515d900afa9a9321f -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 4ba179ab81332bd3a3b5b19267e2a16560d1ef6d5bb89e30c0a6a85e92d14f3169a93309386d2e9d644d3cb333c80fa27864dd97ba0c3092b1e5fb91e752f087 -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = f3f72f88901f6aa67b706813fd8d6bfdfdb9a719df612ebc2674a1ad8236236aa28186ff23d431a1061c2f9c8e3d6b26248548d6cdb0d23c3ba8aa1494efbe3c +SHA512 (linux-6.12-rc5-5-ge42b1a9a2557.tar.xz) = 0d432cd0794eab8393dd9c322f45f4f2337fefcae86c6f1f2346e7be4ed3a3fd00a19ca35c3e91953554d6381ed4518c283e89fb6dd1ead21357c06dbb99c997 +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 029d0a982d60b134314e3e8bd4e2af8e35e68500198b9c2b14000f444ad02f866d3aeabd75350133edb19fcfd8ea2d30c0b974421cdc6f5ffb9c3a699ed585df +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 0d2b3d9490b78ffc9ba4ab49b42248fde9fb16b2c006617881aa64fbac5639520863044d36ece4a30a1ae7de81490c249ca92174cd18e04cbc3357f4f0fde6c4