From 4ef01db52ebdc24051aa5f124cf6bad42fa2160d Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Thu, 4 Apr 2024 18:47:58 +0200 Subject: [PATCH] kernel-6.9.0-0.rc2.20240404gitc85af715cac0.26 * Thu Apr 04 2024 Fedora Kernel Team [6.9.0-0.rc2.c85af715cac0.26] - Linux v6.9.0-0.rc2.c85af715cac0 Resolves: Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- kernel.changelog | 4 ++++ kernel.spec | 9 ++++++--- patch-6.9-redhat.patch | 4 ++-- sources | 6 +++--- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 96c4e2660..5ec3fb3a4 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 = 25 +RHEL_RELEASE = 26 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 0c4f92f4f..eaec1243d 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Thu Apr 04 2024 Fedora Kernel Team [6.9.0-0.rc2.c85af715cac0.26] +- Linux v6.9.0-0.rc2.c85af715cac0 +Resolves: + * Wed Apr 03 2024 Fedora Kernel Team [6.9.0-0.rc2.026e680b0a08.25] - arch/x86: Fix XSAVE check for x86_64-v2 check (Prarit Bhargava) - redhat/Makefile.variables: unquote a variable (Thorsten Leemhuis) diff --git a/kernel.spec b/kernel.spec index beae880c6..44873e309 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.9.0 %define specversion 6.9.0 %define patchversion 6.9 -%define pkgrelease 0.rc2.20240403git026e680b0a08.25 +%define pkgrelease 0.rc2.20240404gitc85af715cac0.26 %define kversion 6 -%define tarfile_release 6.9-rc2-2-g026e680b0a08 +%define tarfile_release 6.9-rc2-80-gc85af715cac0 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20240403git026e680b0a08.25%{?buildid}%{?dist} +%define specrelease 0.rc2.20240404gitc85af715cac0.26%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3958,6 +3958,9 @@ fi\ # # %changelog +* Thu Apr 04 2024 Fedora Kernel Team [6.9.0-0.rc2.c85af715cac0.26] +- Linux v6.9.0-0.rc2.c85af715cac0 + * Wed Apr 03 2024 Fedora Kernel Team [6.9.0-0.rc2.026e680b0a08.25] - arch/x86: Fix XSAVE check for x86_64-v2 check (Prarit Bhargava) - redhat/Makefile.variables: unquote a variable (Thorsten Leemhuis) diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index 69b7f146f..cc994d71a 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -74,7 +74,7 @@ 73 files changed, 2147 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index bb884c14b2f6..2939d792fecd 100644 +index 623fce7d5fcd..c412bbaf26bc 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6880,6 +6880,15 @@ @@ -3866,7 +3866,7 @@ index cd84d8ea1dfb..e4c70a0312bc 100644 const struct lsm_id lockdown_lsmid = { diff --git a/security/security.c b/security/security.c -index 7e118858b545..4098efab18c6 100644 +index 0a9a0ac3f266..a5cfc42f7c33 100644 --- a/security/security.c +++ b/security/security.c @@ -5567,6 +5567,18 @@ int security_locked_down(enum lockdown_reason what) diff --git a/sources b/sources index 13c35ceb3..45c699227 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.9-rc2-2-g026e680b0a08.tar.xz) = ddacab9822e6d075e465dc2476a4ce853d9bf04b4094a817861f46da0e3a19d689ee074ec5a29d41d5185b7fb994b93c39ff532627eeeea22bfe08907727b495 -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 446fd10556db6c8393424e69db458b80d6cef943593de0d84822e879c0aade1401ad9a0054a669aa7a0f43284f906f88dd3e63ba892d2344005092b37cfab6bc -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 218d1984a6608b0e7e7351861e0db9cd5020d03f676c834067d145265462fb4932c380ca9813a508a500545220b1c311aabb6e7791b2ad504083a2ac2a02ecf2 +SHA512 (linux-6.9-rc2-80-gc85af715cac0.tar.xz) = 6297ec2a67d24b801cc61b67b06be773e84037c7d59e289e6dfa2d956c6d31a68f59dc50974e16bd8e1de77c8c9b3abf9d02f200284f509485322871ecd5a3a0 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 7957db05d21e2d7c9f28e96310832bcadd30beadcd91886d938a7161d6045dfd2cc3784a2b0fffa0a99dd0cee99a842d0dd980506c62e0df0669bde9c114f5e5 +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 42c3a3ff2a72bd03cc6b9be0507b1a2342a42a0aafffeeed2de616886090db19db941c165b15fc7a05f4f4cf5c6a5d0c8ffad0c444658245f26bf548dac4d2ed