rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-6.12.0-0.rc4.39

Browse Source 
* Mon Oct 21 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc4.39]
- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek)
- tools/rtla: drop __NR_sched_getattr (Jan Stancek)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2024-10-21 08:23:12 -06:00
parent 0b41a21f27
commit 46ca962034
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
6 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 37 RHEL_RELEASE = 39
# #
# RHEL_REBASE_NUM # RHEL_REBASE_NUM

8
Patchlist.changelog
View File

@ -1,8 +1,8 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/ac800eaab10cb4a12b5d0af771737988408a9fa3 https://gitlab.com/cki-project/kernel-ark/-/commit/cab37c80f953542e991b52337efe10323026a9b9
ac800eaab10cb4a12b5d0af771737988408a9fa3 tools/rtla: fix collision with glibc sched_attr/sched_set_attr cab37c80f953542e991b52337efe10323026a9b9 tools/rtla: fix collision with glibc sched_attr/sched_set_attr
https://gitlab.com/cki-project/kernel-ark/-/commit/3d4b2894460137ae3b130cfe438355eb72f483f6 https://gitlab.com/cki-project/kernel-ark/-/commit/96db7b0931300a5f334e22239f1d58184dfaf02d
3d4b2894460137ae3b130cfe438355eb72f483f6 tools/rtla: drop __NR_sched_getattr 96db7b0931300a5f334e22239f1d58184dfaf02d tools/rtla: drop __NR_sched_getattr
https://gitlab.com/cki-project/kernel-ark/-/commit/77e6d045cb6220934aef9b192b291466fd205d21 https://gitlab.com/cki-project/kernel-ark/-/commit/77e6d045cb6220934aef9b192b291466fd205d21
77e6d045cb6220934aef9b192b291466fd205d21 Revert "Merge branch 'drop_engine_api' into 'os-build'" 77e6d045cb6220934aef9b192b291466fd205d21 Revert "Merge branch 'drop_engine_api' into 'os-build'"

10
kernel.changelog
View File

@ -1,8 +1,16 @@
* Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.37] * Mon Oct 21 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc4.39]
- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek)
- tools/rtla: drop __NR_sched_getattr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek)
Resolves: Resolves:
* Mon Oct 21 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc4.38]
- Linux v6.12.0-0.rc4
Resolves:
* Sun Oct 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.715ca9dd687f.37]
- Linux v6.12.0-0.rc3.715ca9dd687f
Resolves:
* Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.36] * Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.36]
- Linux v6.12.0-0.rc3.3d5ad2d4eca3 - Linux v6.12.0-0.rc3.3d5ad2d4eca3
Resolves: Resolves:

14
kernel.spec
View File

@ -163,13 +163,13 @@ Summary: The Linux kernel
%define specrpmversion 6.12.0 %define specrpmversion 6.12.0
%define specversion 6.12.0 %define specversion 6.12.0
%define patchversion 6.12 %define patchversion 6.12
%define pkgrelease 0.rc3.20241019git3d5ad2d4eca3.37 %define pkgrelease 0.rc4.39
%define kversion 6 %define kversion 6
%define tarfile_release 6.12-rc3-389-g3d5ad2d4eca3 %define tarfile_release 6.12-rc4
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 12 %define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc3.20241019git3d5ad2d4eca3.37%{?buildid}%{?dist} %define specrelease 0.rc4.39%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 6.12.0 %define kabiversion 6.12.0
@ -4136,10 +4136,16 @@ fi\
# #
# #
%changelog %changelog
* Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.37] * Mon Oct 21 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc4.39]
- tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek)
- tools/rtla: drop __NR_sched_getattr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek)
* Mon Oct 21 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc4.38]
- Linux v6.12.0-0.rc4
* Sun Oct 20 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.715ca9dd687f.37]
- Linux v6.12.0-0.rc3.715ca9dd687f
* Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.36] * Sat Oct 19 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.12.0-0.rc3.3d5ad2d4eca3.36]
- Linux v6.12.0-0.rc3.3d5ad2d4eca3 - Linux v6.12.0-0.rc3.3d5ad2d4eca3

2
patch-6.12-redhat.patch
View File

@ -193,7 +193,7 @@ index 000000000000..7465c78a90e6
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 8cf3cf528892..00daac348e0c 100644 index a9a7d9ffaa98..46972770fd97 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.12-rc3-389-g3d5ad2d4eca3.tar.xz) = 87f99a2bd55128af7e54a15d51029fa862d23682e8ce231a48ef54e7b37d38b806485aec18d2401d8b30bbf5c26d2efeabc4daa63c3bbde3515c23edfacce999 SHA512 (linux-6.12-rc4.tar.xz) = 634d15b095a4b5fe844ca7df782130c304db825f2a4da6bd65091b1952ad8712dc34d4d76f1eed3b6d4305896d187799e64dd06afd4a4cbb563d8ba9a78e3dd8
SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = d3b3dc1df9ead1d489242f20286ef7a23c01ee5b8c3da6f0f63e3678e3b57932de6d5333d5a798f0eee22ecb88e5e26b5a59b103d54c8dede7bd4a3e3333765d SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 9e2ddeea36dd0280b0bb5f8cd8ea0208e5bec68a79f181d8f59020fe196a8c527dbb5054964dc32f6d6082bb769fd0a905013cf53364576fc17b27631c6333ca
SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = e3b483d081ef33efbe4515e47ebdfbe9743b56f2de014972ede778e479bc7bc678dd6c41e6f663927ecfaf95d9b5251a8a5e324cd1faa54c5af164938a4b1d26 SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 5c8fa053788d1c387bcbdb1e89012acdff57c170b33d72a79c0626b0a6cbabc8e452aa55ef7073adb4dd814ad6cb878233b39e1712b45a3d8319c5050df96bf6