From 001fd8dfa361c9b48bb560e72028e7a61224193f Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Mon, 8 Apr 2024 16:18:45 +0200 Subject: [PATCH] kernel-6.9.0-0.rc3.30 * Mon Apr 08 2024 Fedora Kernel Team [6.9.0-0.rc3.30] - Linux v6.9.0-0.rc3 Resolves: Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- kernel-x86_64-debug-fedora.config | 1 - kernel-x86_64-debug-rhel.config | 1 - kernel-x86_64-fedora.config | 1 - kernel-x86_64-rhel.config | 1 - kernel-x86_64-rt-debug-rhel.config | 1 - kernel-x86_64-rt-rhel.config | 1 - kernel.changelog | 13 +++++++++++++ kernel.spec | 16 +++++++++++++--- patch-6.9-redhat.patch | 22 +++++++++++----------- sources | 6 +++--- 11 files changed, 41 insertions(+), 24 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5e0fdae4a..64f1f44ac 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 = 27 +RHEL_RELEASE = 30 # # RHEL_REBASE_NUM diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 58698636e..b8da51c9b 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3100,7 +3100,6 @@ CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_TXE=m # CONFIG_INTEL_MEI_VSC_HW is not set CONFIG_INTEL_MEI_WDT=m -# CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m CONFIG_INTEL_OAKTRAIL=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 10ec4abb1..94db56e64 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2741,7 +2741,6 @@ CONFIG_INTEL_MEI_ME=m # CONFIG_INTEL_MEI_TXE is not set # CONFIG_INTEL_MEI_VSC_HW is not set CONFIG_INTEL_MEI_WDT=m -# CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_PMC_CORE=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index fd87fb9bf..6346289c1 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3080,7 +3080,6 @@ CONFIG_INTEL_MEI_PXP=m CONFIG_INTEL_MEI_TXE=m # CONFIG_INTEL_MEI_VSC_HW is not set CONFIG_INTEL_MEI_WDT=m -# CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m CONFIG_INTEL_OAKTRAIL=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index c10af9c46..29214138e 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2725,7 +2725,6 @@ CONFIG_INTEL_MEI_ME=m # CONFIG_INTEL_MEI_TXE is not set # CONFIG_INTEL_MEI_VSC_HW is not set CONFIG_INTEL_MEI_WDT=m -# CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_PMC_CORE=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index a89012849..298185d50 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -2781,7 +2781,6 @@ CONFIG_INTEL_MEI_ME=m # CONFIG_INTEL_MEI_TXE is not set # CONFIG_INTEL_MEI_VSC_HW is not set CONFIG_INTEL_MEI_WDT=m -# CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_PMC_CORE=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index d411d88d1..3384937db 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -2765,7 +2765,6 @@ CONFIG_INTEL_MEI_ME=m # CONFIG_INTEL_MEI_TXE is not set # CONFIG_INTEL_MEI_VSC_HW is not set CONFIG_INTEL_MEI_WDT=m -# CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_PMC_CORE=m diff --git a/kernel.changelog b/kernel.changelog index b35ddd7d7..bac7cf543 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,16 @@ +* Mon Apr 08 2024 Fedora Kernel Team [6.9.0-0.rc3.30] +- Linux v6.9.0-0.rc3 +Resolves: + +* Sun Apr 07 2024 Fedora Kernel Team [6.9.0-0.rc2.f2f80ac80987.29] +- Linux v6.9.0-0.rc2.f2f80ac80987 +Resolves: + +* Sat Apr 06 2024 Fedora Kernel Team [6.9.0-0.rc2.6c6e47d69d82.28] +- redhat/configs: remove CONFIG_INTEL_MENLOW as it is obsolete. (David Arcari) +- Linux v6.9.0-0.rc2.6c6e47d69d82 +Resolves: + * Fri Apr 05 2024 Fedora Kernel Team [6.9.0-0.rc2.8cb4a9a82b21.27] - Linux v6.9.0-0.rc2.8cb4a9a82b21 Resolves: diff --git a/kernel.spec b/kernel.spec index c5c92e7e7..cc2e8c0d8 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.20240405git8cb4a9a82b21.27 +%define pkgrelease 0.rc3.30 %define kversion 6 -%define tarfile_release 6.9-rc2-194-g8cb4a9a82b21 +%define tarfile_release 6.9-rc3 # 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.20240405git8cb4a9a82b21.27%{?buildid}%{?dist} +%define specrelease 0.rc3.30%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3958,6 +3958,16 @@ fi\ # # %changelog +* Mon Apr 08 2024 Fedora Kernel Team [6.9.0-0.rc3.30] +- Linux v6.9.0-0.rc3 + +* Sun Apr 07 2024 Fedora Kernel Team [6.9.0-0.rc2.f2f80ac80987.29] +- Linux v6.9.0-0.rc2.f2f80ac80987 + +* Sat Apr 06 2024 Fedora Kernel Team [6.9.0-0.rc2.6c6e47d69d82.28] +- redhat/configs: remove CONFIG_INTEL_MENLOW as it is obsolete. (David Arcari) +- Linux v6.9.0-0.rc2.6c6e47d69d82 + * Fri Apr 05 2024 Fedora Kernel Team [6.9.0-0.rc2.8cb4a9a82b21.27] - Linux v6.9.0-0.rc2.8cb4a9a82b21 diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index 685a64946..f89f44a19 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -136,7 +136,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 4bef6323c47d..72cb1c5cfe6d 100644 +index e1bf12891cb0..1a96ab05fc5d 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -262,7 +262,7 @@ index 5c1e6d6be267..aa9819032064 100644 get_cpu_address_sizes(c); cpu_parse_early_param(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 0109e6c510e0..cbe8d89c5eb5 100644 +index e125e059e2c4..88e7c5714629 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -20,6 +20,7 @@ @@ -273,7 +273,7 @@ index 0109e6c510e0..cbe8d89c5eb5 100644 #include #include #include -@@ -54,6 +55,7 @@ +@@ -55,6 +56,7 @@ #include #include #include @@ -281,7 +281,7 @@ index 0109e6c510e0..cbe8d89c5eb5 100644 /* * max_low_pfn_mapped: highest directly mapped pfn < 4 GB -@@ -667,6 +669,79 @@ static void __init early_reserve_memory(void) +@@ -668,6 +670,79 @@ static void __init early_reserve_memory(void) trim_snb_memory(); } @@ -361,7 +361,7 @@ index 0109e6c510e0..cbe8d89c5eb5 100644 /* * Dump out kernel offset information on panic. */ -@@ -900,6 +975,13 @@ void __init setup_arch(char **cmdline_p) +@@ -901,6 +976,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -375,7 +375,7 @@ index 0109e6c510e0..cbe8d89c5eb5 100644 reserve_ibft_region(); x86_init.resources.dmi_setup(); -@@ -1061,19 +1143,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1063,19 +1145,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -396,7 +396,7 @@ index 0109e6c510e0..cbe8d89c5eb5 100644 reserve_initrd(); -@@ -1185,6 +1255,8 @@ void __init setup_arch(char **cmdline_p) +@@ -1187,6 +1257,8 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif @@ -1712,7 +1712,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 943d72bdd794..f605013cc0d2 100644 +index 27281a9a8951..62c23c3e8fc1 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -261,6 +261,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1826,7 +1826,7 @@ index 5397fb428b24..3df9c79197d0 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 24193fcb8bd5..de88d8023c8c 100644 +index d0ed64dc7380..e2a0044d1ccd 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -920,6 +920,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); @@ -2162,7 +2162,7 @@ index 675332e49a7b..4a3cbddacef1 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 3cf898670290..cf5f017110b3 100644 +index 58fdf679341d..4a1f0b9eb0de 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -119,6 +119,14 @@ static const char *sd_cache_types[] = { @@ -2249,7 +2249,7 @@ index c0eb139adb07..19ded3068180 100644 } diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index cfb8449c731f..13455c35df4e 100644 +index 044135796f2b..7806462b4af2 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5606,6 +5606,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) diff --git a/sources b/sources index 50cbfec0a..b39c2a6ee 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-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 +SHA512 (linux-6.9-rc3.tar.xz) = f160004bbf34cd019d366bb53774c35ec7ce5a374fbdc3136acf340b9516a06f27fdc21516bcabd89f7d83ef1f3282bb7425f1c46603752bd920dd9e13b3f6e9 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = dbb27eb9ad96da1172fbcfeb7a927ba9d878df59e7be1357231343211fcf096ce1c4fffbbde7eaca5e9077f495fe416b951d12350799d156b957c1c2c007a881 +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 9c029f4d0799b8e4da0b8eb514cdf34a459e7a0fe8ead74315919e1357e4a17874c8e25e8b2524413f511b2b04577287cc7482b638f9bdc915d7f633ae8b882b