From 9f5fa9fd60a8d63053880ef9e13fece9de176daf Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Fri, 5 Apr 2024 18:19:41 +0200 Subject: [PATCH] kernel-6.9.0-0.rc2.20240405git8cb4a9a82b21.27 * Fri Apr 05 2024 Fedora Kernel Team [6.9.0-0.rc2.8cb4a9a82b21.27] - Linux v6.9.0-0.rc2.8cb4a9a82b21 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 5ec3fb3a4..5e0fdae4a 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 = 26 +RHEL_RELEASE = 27 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index eaec1243d..b35ddd7d7 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Fri Apr 05 2024 Fedora Kernel Team [6.9.0-0.rc2.8cb4a9a82b21.27] +- Linux v6.9.0-0.rc2.8cb4a9a82b21 +Resolves: + * Thu Apr 04 2024 Fedora Kernel Team [6.9.0-0.rc2.c85af715cac0.26] - Linux v6.9.0-0.rc2.c85af715cac0 Resolves: diff --git a/kernel.spec b/kernel.spec index 44873e309..c5c92e7e7 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.20240404gitc85af715cac0.26 +%define pkgrelease 0.rc2.20240405git8cb4a9a82b21.27 %define kversion 6 -%define tarfile_release 6.9-rc2-80-gc85af715cac0 +%define tarfile_release 6.9-rc2-194-g8cb4a9a82b21 # 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.20240404gitc85af715cac0.26%{?buildid}%{?dist} +%define specrelease 0.rc2.20240405git8cb4a9a82b21.27%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3958,6 +3958,9 @@ fi\ # # %changelog +* Fri Apr 05 2024 Fedora Kernel Team [6.9.0-0.rc2.8cb4a9a82b21.27] +- Linux v6.9.0-0.rc2.8cb4a9a82b21 + * Thu Apr 04 2024 Fedora Kernel Team [6.9.0-0.rc2.c85af715cac0.26] - Linux v6.9.0-0.rc2.c85af715cac0 diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index cc994d71a..685a64946 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -3098,7 +3098,7 @@ index 3c13240dfc9f..c5f42d2ce38b 100644 obj-$(CONFIG_MULTIUSER) += groups.o obj-$(CONFIG_VHOST_TASK) += vhost_task.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index ae2ff73bde7e..d5165f6883b6 100644 +index c287925471f6..fed1012487f2 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -26,6 +26,7 @@ @@ -3133,7 +3133,7 @@ index ae2ff73bde7e..d5165f6883b6 100644 int sysctl_unprivileged_bpf_disabled __read_mostly = IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; -@@ -5954,6 +5972,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, +@@ -5983,6 +6001,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, if (write && !ret) { if (locked_state && unpriv_enable != 1) return -EPERM; diff --git a/sources b/sources index 45c699227..50cbfec0a 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-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 +SHA512 (linux-6.9-rc2-194-g8cb4a9a82b21.tar.xz) = cf9df7448883d35fd884d2a71be7c1bd959b00779c32c4b2ffdb57849349c05dc4cc71fb132243d376572b71dfa3f2ab6d6ea6d61d889c900becac7af3046918 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 06973e00804f682945cd8a2d4928ec17b74d846f8c7ff65e9971f0389b414f4361a2f78177c1a9d1528ebd225b105312fbec2ffcc7b16e475d13f7e153697c5e +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = bad2ad5741f719757c59c4f110b5d43a312257ef90c418810a06de7594267e8ac139363f94101e88921290320c37bb4717a11a9a4257ff158dc9f1f38087a16a