diff --git a/Makefile.rhelver b/Makefile.rhelver index 045195d74..931d6835d 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 = 53 +RHEL_RELEASE = 54 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index a3ebb6e44..d9ef74ad6 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/4946485cefe5827165f96e1d2e53d90b504edc2f - 4946485cefe5827165f96e1d2e53d90b504edc2f tools/rtla: fix collision with glibc sched_attr/sched_set_attr +https://gitlab.com/cki-project/kernel-ark/-/commit/0491714144efbdb956f3d19b3ef8e2bf97d83b6b + 0491714144efbdb956f3d19b3ef8e2bf97d83b6b tools/rtla: fix collision with glibc sched_attr/sched_set_attr -https://gitlab.com/cki-project/kernel-ark/-/commit/f438b40a4aa35432a67f0cd98597a0bf937bd075 - f438b40a4aa35432a67f0cd98597a0bf937bd075 tools/rtla: drop __NR_sched_getattr +https://gitlab.com/cki-project/kernel-ark/-/commit/95dbf498fe69d90d3ff993ccfcd648dfa8925b9f + 95dbf498fe69d90d3ff993ccfcd648dfa8925b9f tools/rtla: drop __NR_sched_getattr https://gitlab.com/cki-project/kernel-ark/-/commit/09dd929d10260f56dc7cca7435a8b76347423d52 09dd929d10260f56dc7cca7435a8b76347423d52 [redhat] rh_messages.h: Mark BlueField-4 as disabled diff --git a/kernel.changelog b/kernel.changelog index e1c121fa6..47bfe75cb 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,14 @@ -* Wed Nov 06 2024 Fedora Kernel Team [6.12.0-0.rc6.2e1b3cc9d7f7.53] +* Thu Nov 07 2024 Fedora Kernel Team [6.12.0-0.rc6.ff7afaeca1a1.54] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) Resolves: +* Thu Nov 07 2024 Fedora Kernel Team [6.12.0-0.rc6.ff7afaeca1a1.53] +- redhat: set new gcov configs (Jan Stancek) +- Don't ignore gitkeep files for ark-infra (Don Zickus) +- Linux v6.12.0-0.rc6.ff7afaeca1a1 +Resolves: + * Wed Nov 06 2024 Fedora Kernel Team [6.12.0-0.rc6.2e1b3cc9d7f7.52] - redhat/kernel.spec: don't clear entire libdir when building tools (Jan Stancek) - redhat/configs: enable usbip for rhel (Jose Ignacio Tornos Martinez) diff --git a/kernel.spec b/kernel.spec index 39b9e055a..bb1223159 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.20241106git2e1b3cc9d7f7.53 +%define pkgrelease 0.rc6.20241107gitff7afaeca1a1.54 %define kversion 6 -%define tarfile_release 6.12-rc6-77-g2e1b3cc9d7f7 +%define tarfile_release 6.12-rc6-110-gff7afaeca1a1 # 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.20241106git2e1b3cc9d7f7.53%{?buildid}%{?dist} +%define specrelease 0.rc6.20241107gitff7afaeca1a1.54%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -4151,10 +4151,15 @@ fi\ # # %changelog -* Wed Nov 06 2024 Fedora Kernel Team [6.12.0-0.rc6.2e1b3cc9d7f7.53] +* Thu Nov 07 2024 Fedora Kernel Team [6.12.0-0.rc6.ff7afaeca1a1.54] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) +* Thu Nov 07 2024 Fedora Kernel Team [6.12.0-0.rc6.ff7afaeca1a1.53] +- redhat: set new gcov configs (Jan Stancek) +- Don't ignore gitkeep files for ark-infra (Don Zickus) +- Linux v6.12.0-0.rc6.ff7afaeca1a1 + * Wed Nov 06 2024 Fedora Kernel Team [6.12.0-0.rc6.2e1b3cc9d7f7.52] - redhat/kernel.spec: don't clear entire libdir when building tools (Jan Stancek) - redhat/configs: enable usbip for rhel (Jose Ignacio Tornos Martinez) diff --git a/partial-kgcov-debug-snip.config b/partial-kgcov-debug-snip.config index fb373597e..6a3497827 100644 --- a/partial-kgcov-debug-snip.config +++ b/partial-kgcov-debug-snip.config @@ -2,3 +2,5 @@ CONFIG_GCOV_KERNEL=y CONFIG_GCOV_PROFILE_ALL=y # CONFIG_GCOV_PROFILE_FTRACE is not set +CONFIG_GCOV_PROFILE_RDS=y +CONFIG_GCOV_PROFILE_URING=y diff --git a/partial-kgcov-snip.config b/partial-kgcov-snip.config index fb373597e..6a3497827 100644 --- a/partial-kgcov-snip.config +++ b/partial-kgcov-snip.config @@ -2,3 +2,5 @@ CONFIG_GCOV_KERNEL=y CONFIG_GCOV_PROFILE_ALL=y # CONFIG_GCOV_PROFILE_FTRACE is not set +CONFIG_GCOV_PROFILE_RDS=y +CONFIG_GCOV_PROFILE_URING=y diff --git a/sources b/sources index 9e5236717..d6f19089d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12-rc6-77-g2e1b3cc9d7f7.tar.xz) = ff149b6b4a0da4326569380331cdfc4d8119d98fc53ffd41d19fadbbbbd07454a951d938a48bf1698e740d2747b4810d5815c77e346987a56b5409b84bf15cf7 -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = b13c0fbd7f97f900789fe7e36582f80e3c460a6934a58f1221dd56e753743665fefe2e5fc0ff902309b03286a4f9551dbadaca4cbe7eb84f86649d177e674e48 -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = c7565c113a2705d11084fe9cabef7cd1b5796ebc758eecd7f864415ec2ddaee3b54f241cab8dc08bb8980a828ba88e314ddf510089ce7517b59305d4e0e33942 +SHA512 (linux-6.12-rc6-110-gff7afaeca1a1.tar.xz) = 57131c0bdc3844c10f988fc145a4979692d5905a1bde0d9e0a1cabfdd81968e5392b1304d667b7d5aa3826e91bf3c5db7cc729dc07101553f011c06fde52339e +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = f742591ebf903cf65cd1924333799df71469e645e123ee230a4c1dd5b6c8ce6f1309d2053e8ea451852e3ab73c717c6e8aa369ae8ea2cc3bb860787f260006ca +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 8f324fc72f15df8ab200b03cd4b5eec506618179ccb1a15e46c213dffe2c249a73c281129717130ffb5bb1d2929e9d23d232639b6cbb2915b651e0e593919c94 diff --git a/uki_addons.json b/uki_addons.json index 8c2aebc64..a13e8ae16 100644 --- a/uki_addons.json +++ b/uki_addons.json @@ -1,21 +1,4 @@ { - "virt": { - "common": { - "fips-disable.addon": [ - "fips=0\n" - ], - "fips-enable.addon": [ - "fips=1\n" - ] - }, - "rhel": { - "aarch64": { - "crashkernel-default.addon": [ - "crashkernel=1G-4G:256M,4G-64G:320M,64G-:576M\n" - ] - } - } - }, "common": { "crashkernel-1536M.addon": [ "crashkernel=1536M\n" @@ -38,5 +21,22 @@ "crashkernel-default.addon": [ "crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M\n" ] + }, + "virt": { + "common": { + "fips-disable.addon": [ + "fips=0\n" + ], + "fips-enable.addon": [ + "fips=1\n" + ] + }, + "rhel": { + "aarch64": { + "crashkernel-default.addon": [ + "crashkernel=1G-4G:256M,4G-64G:320M,64G-:576M\n" + ] + } + } } } \ No newline at end of file