From 4b1f147c491032f91d1ba21173b7c5447e7eb307 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sat, 22 Feb 2025 08:37:59 -0700 Subject: [PATCH] kernel-6.13.4-200 * Sat Feb 22 2025 Justin M. Forbes [6.13.4-0] - Config update for 6.13.4 stable (Justin M. Forbes) - mei: vsc: Use "wakeuphostint" when getting the host wakeup GPIO (Hans de Goede) - Fix up mismatch of CONFIG_CPUFREQ_DT_PLATDEV for automotive (Justin M. Forbes) - Linux v6.13.4 Resolves: Signed-off-by: Justin M. Forbes --- kernel-aarch64-16k-debug-fedora.config | 1 + kernel-aarch64-16k-fedora.config | 1 + kernel-aarch64-64k-debug-rhel.config | 1 + kernel-aarch64-64k-rhel.config | 1 + kernel-aarch64-automotive-debug-rhel.config | 1 + kernel-aarch64-automotive-rhel.config | 1 + kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 1 + kernel-aarch64-rt-debug-fedora.config | 1 + kernel-aarch64-rt-debug-rhel.config | 1 + kernel-aarch64-rt-fedora.config | 1 + kernel-aarch64-rt-rhel.config | 1 + kernel.changelog | 7 ++++++ kernel.spec | 16 +++++++------ patch-6.13-redhat.patch | 26 ++++++++++----------- sources | 6 ++--- 18 files changed, 46 insertions(+), 23 deletions(-) diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 872f3221d..3f0f993a3 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -4722,6 +4722,7 @@ CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MIPI_I3C_HCI=m +# CONFIG_MIPI_I3C_HCI_PCI is not set CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index bcc3357e5..6c8823ac4 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -4696,6 +4696,7 @@ CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MIPI_I3C_HCI=m +# CONFIG_MIPI_I3C_HCI_PCI is not set CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index df63a6ace..eebd520e4 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3835,6 +3835,7 @@ CONFIG_MII=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MIPI_I3C_HCI is not set +# CONFIG_MIPI_I3C_HCI_PCI is not set # CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 7778026d9..76e529c51 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3814,6 +3814,7 @@ CONFIG_MII=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MIPI_I3C_HCI is not set +# CONFIG_MIPI_I3C_HCI_PCI is not set # CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set diff --git a/kernel-aarch64-automotive-debug-rhel.config b/kernel-aarch64-automotive-debug-rhel.config index 3088d1156..7ea292cd5 100644 --- a/kernel-aarch64-automotive-debug-rhel.config +++ b/kernel-aarch64-automotive-debug-rhel.config @@ -4078,6 +4078,7 @@ CONFIG_MII=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set CONFIG_MIPI_I3C_HCI=m +# CONFIG_MIPI_I3C_HCI_PCI is not set # CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set diff --git a/kernel-aarch64-automotive-rhel.config b/kernel-aarch64-automotive-rhel.config index 1e1053bd7..f93c07208 100644 --- a/kernel-aarch64-automotive-rhel.config +++ b/kernel-aarch64-automotive-rhel.config @@ -4057,6 +4057,7 @@ CONFIG_MII=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set CONFIG_MIPI_I3C_HCI=m +# CONFIG_MIPI_I3C_HCI_PCI is not set # CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 908f2bb8f..98393de29 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4722,6 +4722,7 @@ CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MIPI_I3C_HCI=m +# CONFIG_MIPI_I3C_HCI_PCI is not set CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 1e807513e..d41c2db65 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3833,6 +3833,7 @@ CONFIG_MII=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MIPI_I3C_HCI is not set +# CONFIG_MIPI_I3C_HCI_PCI is not set # CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 56afcd3fb..0c101262c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4696,6 +4696,7 @@ CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MIPI_I3C_HCI=m +# CONFIG_MIPI_I3C_HCI_PCI is not set CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 5a0955617..59b2fd490 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3812,6 +3812,7 @@ CONFIG_MII=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MIPI_I3C_HCI is not set +# CONFIG_MIPI_I3C_HCI_PCI is not set # CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index dc92404b0..1b4e507a8 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -4727,6 +4727,7 @@ CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MIPI_I3C_HCI=m +# CONFIG_MIPI_I3C_HCI_PCI is not set CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 9ad713c60..c396c98e3 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3874,6 +3874,7 @@ CONFIG_MII=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MIPI_I3C_HCI is not set +# CONFIG_MIPI_I3C_HCI_PCI is not set # CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index ae09d6770..8dbf684ad 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -4701,6 +4701,7 @@ CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MIPI_I3C_HCI=m +# CONFIG_MIPI_I3C_HCI_PCI is not set CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index aa4c91383..781b45ae9 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3853,6 +3853,7 @@ CONFIG_MII=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MIPI_I3C_HCI is not set +# CONFIG_MIPI_I3C_HCI_PCI is not set # CONFIG_MISC_ALCOR_PCI is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_MISC_RTSX_PCI is not set diff --git a/kernel.changelog b/kernel.changelog index ba0e8f4e2..5764e96f9 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,10 @@ +* Sat Feb 22 2025 Justin M. Forbes [6.13.4-0] +- Config update for 6.13.4 stable (Justin M. Forbes) +- mei: vsc: Use "wakeuphostint" when getting the host wakeup GPIO (Hans de Goede) +- Fix up mismatch of CONFIG_CPUFREQ_DT_PLATDEV for automotive (Justin M. Forbes) +- Linux v6.13.4 +Resolves: + * Mon Feb 17 2025 Justin M. Forbes [6.13.3-0] - CONFIG_CPUFREQ_DT_PLATDEV is bool now (Justin M. Forbes) - efi,lockdown: fix kernel lockdown on Secure Boot (Ondrej Mosnacek) {CVE-2025-1272} diff --git a/kernel.spec b/kernel.spec index 6dccc84fe..c65e05390 100644 --- a/kernel.spec +++ b/kernel.spec @@ -159,18 +159,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.13.3 -%define specversion 6.13.3 +%define specrpmversion 6.13.4 +%define specversion 6.13.4 %define patchversion 6.13 -%define pkgrelease 201 +%define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.13.3 +%define tarfile_release 6.13.4 # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 201%{?buildid}%{?dist} +%define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.13.3 +%define kabiversion 6.13.4 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4166,9 +4166,11 @@ fi\ # # %changelog -* Wed Feb 19 2025 Justin M. Forbes [6.13.3-201] +* Sat Feb 22 2025 Justin M. Forbes [6.13.4-0] +- Config update for 6.13.4 stable (Justin M. Forbes) - mei: vsc: Use "wakeuphostint" when getting the host wakeup GPIO (Hans de Goede) - Fix up mismatch of CONFIG_CPUFREQ_DT_PLATDEV for automotive (Justin M. Forbes) +- Linux v6.13.4 * Mon Feb 17 2025 Justin M. Forbes [6.13.3-0] - CONFIG_CPUFREQ_DT_PLATDEV is bool now (Justin M. Forbes) diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index adf933000..f93420410 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -672,7 +672,7 @@ index 0fa7c5728f1e..e404279c8610 100644 M: Srinivas Pandruvada L: platform-driver-x86@vger.kernel.org diff --git a/Makefile b/Makefile -index 423d087afad2..4a43caee1965 100644 +index c436a6e64971..1056b6318e7c 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -712,7 +712,7 @@ index 423d087afad2..4a43caee1965 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1910,6 +1933,23 @@ endif +@@ -1905,6 +1928,23 @@ endif ifdef CONFIG_MODULES @@ -1182,7 +1182,7 @@ index a2d0009560d0..4f3486e6a84b 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 60c64b81d2c3..19cb19cf67d4 100644 +index 1992d1176c7e..666e6845bd92 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -1193,7 +1193,7 @@ index 60c64b81d2c3..19cb19cf67d4 100644 #include -@@ -1008,40 +1009,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -1010,40 +1011,101 @@ int efi_mem_type(unsigned long phys_addr) return -EINVAL; } @@ -9451,7 +9451,7 @@ index c4bb8dfe1a45..a17435a61ed3 100644 { } diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 76f4df75b08a..d7af71f1825b 100644 +index 0a1f668999ce..8aba731f9ce3 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4451,6 +4451,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -9514,10 +9514,10 @@ index af62a8ed8620..bf275aac44e1 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 21ac9b464696..24a92295bd8d 100644 +index 906daf423cb0..5e69805e1016 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5846,6 +5846,13 @@ static void hub_event(struct work_struct *work) +@@ -5856,6 +5856,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -9545,7 +9545,7 @@ index b164da5e129e..72bfb79b491d 100644 * Miscellaneous stuff. */ diff --git a/include/linux/efi.h b/include/linux/efi.h -index e5815867aba9..b17440aaf863 100644 +index 8bcd629ee250..a7f3e750f2fc 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -45,6 +45,8 @@ struct screen_info; @@ -9557,7 +9557,7 @@ index e5815867aba9..b17440aaf863 100644 typedef unsigned long efi_status_t; typedef u8 efi_bool_t; typedef u16 efi_char16_t; /* UNICODE character */ -@@ -864,6 +866,14 @@ static inline int efi_range_is_wc(unsigned long start, unsigned long len) +@@ -865,6 +867,14 @@ static inline int efi_range_is_wc(unsigned long start, unsigned long len) #define EFI_MEM_ATTR 9 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */ #define EFI_MEM_NO_SOFT_RESERVE 10 /* Is the kernel configured to ignore soft reservations? */ #define EFI_PRESERVE_BS_REGIONS 11 /* Are EFI boot-services memory segments available? */ @@ -9572,7 +9572,7 @@ index e5815867aba9..b17440aaf863 100644 #ifdef CONFIG_EFI /* -@@ -875,6 +885,8 @@ static inline bool efi_enabled(int feature) +@@ -876,6 +886,8 @@ static inline bool efi_enabled(int feature) } extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused); @@ -9581,7 +9581,7 @@ index e5815867aba9..b17440aaf863 100644 bool __pure __efi_soft_reserve_enabled(void); static inline bool __pure efi_soft_reserve_enabled(void) -@@ -896,6 +908,8 @@ static inline bool efi_enabled(int feature) +@@ -897,6 +909,8 @@ static inline bool efi_enabled(int feature) static inline void efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {} @@ -9590,7 +9590,7 @@ index e5815867aba9..b17440aaf863 100644 static inline bool efi_soft_reserve_enabled(void) { return false; -@@ -910,6 +924,7 @@ static inline void efi_find_mirror(void) {} +@@ -911,6 +925,7 @@ static inline void efi_find_mirror(void) {} #endif extern int efi_status_to_err(efi_status_t status); @@ -9598,7 +9598,7 @@ index e5815867aba9..b17440aaf863 100644 /* * Variable Attributes -@@ -1125,13 +1140,6 @@ static inline bool efi_runtime_disabled(void) { return true; } +@@ -1126,13 +1141,6 @@ static inline bool efi_runtime_disabled(void) { return true; } extern void efi_call_virt_check_flags(unsigned long flags, const void *caller); extern unsigned long efi_call_virt_save_flags(void); diff --git a/sources b/sources index 7ce0b1ecc..daa6c92c0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13.3.tar.xz) = 0e1501a5d588f11964259a30782accd9dc6a45a913296f3638237ab02e443a8028b166d2fa27c2574d2b604c867ddc923805558624744a75090ed1f40938b789 -SHA512 (kernel-abi-stablelists-6.13.3.tar.xz) = f023cac70a6566556ef54067b061132fff8b98620459cb122be2da1a06ef780397ad053f51b6cc74b32b59e63fa744efe78bc3498b31751a655be20129a6fcdc -SHA512 (kernel-kabi-dw-6.13.3.tar.xz) = d07bd97d50e3113f10c8fe1c2b92b84b5ccb51f7ac3fe883a63200181afaff11e6880f5a17e641fec65a620e2e6fd75ee6adae48a86a286db00838952ab9d916 +SHA512 (linux-6.13.4.tar.xz) = ce4c354d3b6b9c71bea3012d31d68e5e8f573097f324ccad98891039cc2459597dcdedac943c718badfc62a5dd5c24886f0e3abf7232bd07f3588b969c00ffb3 +SHA512 (kernel-abi-stablelists-6.13.4.tar.xz) = cddd4974ad591b77fcd2d08d50314106258dad07b035347195966ed122c07ff54b0ddd31d314b679f8331e0a072ffca8a1c40d770e97ea9773860794d59b5d1a +SHA512 (kernel-kabi-dw-6.13.4.tar.xz) = 4d39a05dc3ac97ad4fdf03dfdbf3d350733ec2c567e724f03339efaee07bb4818b0bc26b01888b7cfe159332d28149838fedfaef3c7602e89b2855dd9db409bc