From 935d38d4b3437268588232820c5dfd6ac3401f05 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 9 Nov 2023 08:18:19 -0600 Subject: [PATCH] kernel-6.7.0-0.rc0.20231109git6bc986ab839c.12 * Thu Nov 09 2023 Fedora Kernel Team [6.7.0-0.rc0.6bc986ab839c.12] - Linux v6.7.0-0.rc0.6bc986ab839c Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.spec | 9 ++++++--- patch-6.7-redhat.patch | 4 ++-- sources | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 7f148a411..3606a7785 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 = 11 +RHEL_RELEASE = 12 # # RHEL_REBASE_NUM diff --git a/kernel.spec b/kernel.spec index 8fbccb3d0..2890523c5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc0.20231108git305230142ae0.11 +%define pkgrelease 0.rc0.20231109git6bc986ab839c.12 %define kversion 6 -%define tarfile_release 6.6-15365-g305230142ae0 +%define tarfile_release 6.6-15494-g6bc986ab839c # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20231108git305230142ae0.11%{?buildid}%{?dist} +%define specrelease 0.rc0.20231109git6bc986ab839c.12%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3709,6 +3709,9 @@ fi\ # # %changelog +* Thu Nov 09 2023 Fedora Kernel Team [6.7.0-0.rc0.6bc986ab839c.12] +- Linux v6.7.0-0.rc0.6bc986ab839c + * Wed Nov 08 2023 Fedora Kernel Team [6.7.0-0.rc0.305230142ae0.11] - Turn CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514 on for Fedora x86 (Jason Montleon) - kernel/rh_messages.c: Mark functions as possibly unused (Prarit Bhargava) diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 45c125bc7..fb09784f2 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -72,10 +72,10 @@ 71 files changed, 2060 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 2a4bc78c27ec..6590dbfbf4b4 100644 +index 7b4d7aeab601..b1d6d25609d2 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6794,6 +6794,15 @@ +@@ -6801,6 +6801,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. diff --git a/sources b/sources index fcc5dbe61..33fbd98b9 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.6-15365-g305230142ae0.tar.xz) = d020d54b38fcfe46fb3eb87f53c10c1eef4b6789e140f35cce5894e77bfc9f599591ef0cfb4b4c3847e92a59ce3d861b81b34b94e25c36f8d7f8df8fb91b52a6 -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 90d2d5a9364d6b1382b04bcc89a7628ace781c7139b3a5775a4d3adab37f19bd22883b799aec7e2272d1459413cb99c23070b7fe4cc86e896d573ae494ca6807 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 405da14d0dc8573b5f664fc36bd3c4129532a4b8ace77c9444fdeaf0d7cebe867b1a3eba183c5cfd5f83c851c39d163c456caf71753ac684b3cc4025768a8212 +SHA512 (linux-6.6-15494-g6bc986ab839c.tar.xz) = 01cac6fd05c4afa7c9f3bb22864d902293f688383c0675876338d773a71e5f24a4f8d3cd59b359c94f7c90348b9cc6bfb5ea7aba605550ebb3172cc519611ccc +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = fd66a50f66b9e9c440836223c0d7b3c4456baea02bd56398630dc8733aa68442896c45bf501e0a74d480f69dd6ff55c0fbcc309f299d852a977e266320e5a8d1 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = acf1fbc7bb6aeff7a09db52563a59915862430eacc3ffdc26e2014c3fbd187d2e820d64baef0a0f83dc134c6757612c7bbeadeb2ebc619ca62344a69b9370a95