From fadcfe077024f2fc81ce493dfabac5e460cbd0c7 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 17 Nov 2025 07:55:59 -0700 Subject: [PATCH] kernel-6.18.0-0.rc6.51 * Mon Nov 17 2025 Fedora Kernel Team [6.18.0-0.rc6.51] - powerpc/tools: drop `-o pipefail` in gcc check scripts (Jan Stancek) - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 7 ++--- kernel.changelog | 17 +++++++++-- kernel.spec | 23 +++++++++----- patch-6.18-redhat.patch | 66 +++++------------------------------------ sources | 6 ++-- 6 files changed, 43 insertions(+), 78 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 3aab04d93..54fc96563 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 = 48 +RHEL_RELEASE = 51 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 82b22d242..251e46263 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/54f43ab689bb165ca1f66d137cecf21ad6e5927c - 54f43ab689bb165ca1f66d137cecf21ad6e5927c gendwarfksyms: Skip files with no exports - -https://gitlab.com/cki-project/kernel-ark/-/commit/f9a46a75d30a9d745313ad63d4750fa1b1fbacf2 - f9a46a75d30a9d745313ad63d4750fa1b1fbacf2 powerpc/tools: drop `-o pipefail` in gcc check scripts +https://gitlab.com/cki-project/kernel-ark/-/commit/dac13f95bc6d0d13f5a8f17edc9885db53cc4ada + dac13f95bc6d0d13f5a8f17edc9885db53cc4ada powerpc/tools: drop `-o pipefail` in gcc check scripts https://gitlab.com/cki-project/kernel-ark/-/commit/77bb95c34bd75769a4e4d1c706cee2521bf7c455 77bb95c34bd75769a4e4d1c706cee2521bf7c455 kernel: extend rh_waived to cope better with the CVE mitigations case diff --git a/kernel.changelog b/kernel.changelog index 1de4921ca..f326ccf79 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,9 +1,22 @@ -* Fri Nov 14 2025 Fedora Kernel Team [6.18.0-0.rc5.6da43bbeb691.48] -- gendwarfksyms: Skip files with no exports (Sami Tolvanen) +* Mon Nov 17 2025 Fedora Kernel Team [6.18.0-0.rc6.51] - powerpc/tools: drop `-o pipefail` in gcc check scripts (Jan Stancek) - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) Resolves: +* Mon Nov 17 2025 Fedora Kernel Team [6.18.0-0.rc6.50] +- Linux v6.18.0-0.rc6 +Resolves: + +* Sun Nov 16 2025 Fedora Kernel Team [6.18.0-0.rc5.f824272b6e3f.49] +- redhat/configs: enable Micel PHY for NXP Automotive SoCs S32G2xx/S32G3xx/S32R45 (Alessandro Carminati) +- redhat/configs: enable Synopsis DWMAC IP on NXP Automotive SoCs S32G2xx/S32G3xx/S32R45 (Alessandro Carminati) +- Linux v6.18.0-0.rc5.f824272b6e3f +Resolves: + +* Sat Nov 15 2025 Fedora Kernel Team [6.18.0-0.rc5.7a0892d2836e.48] +- Linux v6.18.0-0.rc5.7a0892d2836e +Resolves: + * Fri Nov 14 2025 Fedora Kernel Team [6.18.0-0.rc5.6da43bbeb691.47] - Linux v6.18.0-0.rc5.6da43bbeb691 Resolves: diff --git a/kernel.spec b/kernel.spec index 29891b6fd..f91d49e57 100644 --- a/kernel.spec +++ b/kernel.spec @@ -176,13 +176,13 @@ Summary: The Linux kernel %define specrpmversion 6.18.0 %define specversion 6.18.0 %define patchversion 6.18 -%define pkgrelease 0.rc5.251114g6da43bbeb6918.48 +%define pkgrelease 0.rc6.51 %define kversion 6 -%define tarfile_release 6.18-rc5-214-g6da43bbeb6918 +%define tarfile_release 6.18-rc6 # This is needed to do merge window version magic %define patchlevel 18 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.251114g6da43bbeb6918.48%{?buildid}%{?dist} +%define specrelease 0.rc6.51%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.18.0 @@ -4506,14 +4506,21 @@ fi\ # # %changelog -* Fri Nov 14 2025 Justin M. Forbes [6.18.0-0.rc5.251114g6da43bbeb6918.48] -- Linux v6.18.0-0.rc5.251114g6da43bbeb6918 - -* Fri Nov 14 2025 Fedora Kernel Team [6.18.0-0.rc5.6da43bbeb691.48] -- gendwarfksyms: Skip files with no exports (Sami Tolvanen) +* Mon Nov 17 2025 Fedora Kernel Team [6.18.0-0.rc6.51] - powerpc/tools: drop `-o pipefail` in gcc check scripts (Jan Stancek) - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) +* Mon Nov 17 2025 Fedora Kernel Team [6.18.0-0.rc6.50] +- Linux v6.18.0-0.rc6 + +* Sun Nov 16 2025 Fedora Kernel Team [6.18.0-0.rc5.f824272b6e3f.49] +- redhat/configs: enable Micel PHY for NXP Automotive SoCs S32G2xx/S32G3xx/S32R45 (Alessandro Carminati) +- redhat/configs: enable Synopsis DWMAC IP on NXP Automotive SoCs S32G2xx/S32G3xx/S32R45 (Alessandro Carminati) +- Linux v6.18.0-0.rc5.f824272b6e3f + +* Sat Nov 15 2025 Fedora Kernel Team [6.18.0-0.rc5.7a0892d2836e.48] +- Linux v6.18.0-0.rc5.7a0892d2836e + * Fri Nov 14 2025 Fedora Kernel Team [6.18.0-0.rc5.6da43bbeb691.47] - Linux v6.18.0-0.rc5.6da43bbeb691 diff --git a/patch-6.18-redhat.patch b/patch-6.18-redhat.patch index 6431df620..2cdc8c7f6 100644 --- a/patch-6.18-redhat.patch +++ b/patch-6.18-redhat.patch @@ -74,9 +74,6 @@ kernel/rh_messages.h | 333 +++++++++++++ kernel/rh_waived.c | 147 ++++++ scripts/Makefile.lib | 3 + - scripts/gendwarfksyms/gendwarfksyms.c | 3 +- - scripts/gendwarfksyms/gendwarfksyms.h | 2 +- - scripts/gendwarfksyms/symbols.c | 4 +- scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- @@ -84,7 +81,7 @@ security/lockdown/lockdown.c | 11 + tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 -- - 86 files changed, 2829 insertions(+), 248 deletions(-) + 83 files changed, 2823 insertions(+), 245 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 6c42061ca20e5..88db6c8c0453c 100644 @@ -210,7 +207,7 @@ index 0000000000000..85771d74c34f9 + +endmenu diff --git a/Makefile b/Makefile -index fb4389aa5d5f1..62640dc9d2614 100644 +index d763c2c75cdbf..dd11e7ece1307 100644 --- a/Makefile +++ b/Makefile @@ -355,6 +355,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) @@ -2127,10 +2124,10 @@ index 302d61783f6c0..ff731f0b3e2ca 100644 return rc; if (rc < 0) { diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 214ed060ca1b3..90a0bd985ad53 100644 +index b9c252aa6fe08..166a5815e1efb 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4451,6 +4451,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4453,6 +4453,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); @@ -2576,10 +2573,10 @@ index 6f972a66c13ee..d484940c73bd0 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index d1fdf81fbe1e4..7f956e957fa4e 100644 +index bf97d49c23cf5..e451ed55fd96a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1649,6 +1649,7 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1651,6 +1651,7 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); @@ -2587,7 +2584,7 @@ index d1fdf81fbe1e4..7f956e957fa4e 100644 int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass); -@@ -2765,6 +2766,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) +@@ -2767,6 +2768,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) return false; } @@ -4517,55 +4514,6 @@ index 1d581ba5df66f..7826803444df9 100644 objtool-args = $(objtool-args-y) \ $(if $(delay-objtool), --link) \ -diff --git a/scripts/gendwarfksyms/gendwarfksyms.c b/scripts/gendwarfksyms/gendwarfksyms.c -index 08ae61eb327ea..f5203d1640ee6 100644 ---- a/scripts/gendwarfksyms/gendwarfksyms.c -+++ b/scripts/gendwarfksyms/gendwarfksyms.c -@@ -138,7 +138,8 @@ int main(int argc, char **argv) - error("no input files?"); - } - -- symbol_read_exports(stdin); -+ if (!symbol_read_exports(stdin)) -+ return 0; - - if (symtypes_file) { - symfile = fopen(symtypes_file, "w"); -diff --git a/scripts/gendwarfksyms/gendwarfksyms.h b/scripts/gendwarfksyms/gendwarfksyms.h -index d9c06d2cb1dfc..32cec8f7695a8 100644 ---- a/scripts/gendwarfksyms/gendwarfksyms.h -+++ b/scripts/gendwarfksyms/gendwarfksyms.h -@@ -123,7 +123,7 @@ struct symbol { - typedef void (*symbol_callback_t)(struct symbol *, void *arg); - - bool is_symbol_ptr(const char *name); --void symbol_read_exports(FILE *file); -+int symbol_read_exports(FILE *file); - void symbol_read_symtab(int fd); - struct symbol *symbol_get(const char *name); - void symbol_set_ptr(struct symbol *sym, Dwarf_Die *ptr); -diff --git a/scripts/gendwarfksyms/symbols.c b/scripts/gendwarfksyms/symbols.c -index 35ed594f0749b..ecddcb5ffcdfb 100644 ---- a/scripts/gendwarfksyms/symbols.c -+++ b/scripts/gendwarfksyms/symbols.c -@@ -128,7 +128,7 @@ static bool is_exported(const char *name) - return for_each(name, NULL, NULL) > 0; - } - --void symbol_read_exports(FILE *file) -+int symbol_read_exports(FILE *file) - { - struct symbol *sym; - char *line = NULL; -@@ -159,6 +159,8 @@ void symbol_read_exports(FILE *file) - - free(line); - debug("%d exported symbols", nsym); -+ -+ return nsym; - } - - static void get_symbol(struct symbol *sym, void *arg) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 47c8aa2a69392..de98c5afa921e 100644 --- a/scripts/mod/modpost.c diff --git a/sources b/sources index dbcc6bd6e..702b37600 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.18-rc5-214-g6da43bbeb6918.tar.xz) = baebedd3dcfd11db1cad91fb602f569e25a5ca7c6609084e8009fac82c3f678b3853bcf084f079881d82a62d1c3a5a207783d2216c6007d32f03eaba67842171 -SHA512 (kernel-abi-stablelists-6.18.0.tar.xz) = 3847a01712880255c11d9c26b5bf93053bae7d69334548e5c05fd69c2d5a8ce71a47a87ff4c61de531dc1b037e807cc452cc01a3cadff0715901406003a90ba0 -SHA512 (kernel-kabi-dw-6.18.0.tar.xz) = 307c4abfaba3f2d646030194bb39578c7b2663de8cc71e0dba2156a11bd60382a7feac2804a10db7d7af1121075d8d8c85dac4cc76d78e2ff9ac4a5aa2e94a2d +SHA512 (linux-6.18-rc6.tar.xz) = 1cb629bf0f2a2e7dd6ab69e3a16557d63d689eb37c4eabf4dc16a5de51b60f2585bf7f28bbec097fbbb5e603d8bb98c3b01fcf050649897c6c796cc274faf088 +SHA512 (kernel-abi-stablelists-6.18.0.tar.xz) = ac1f0ac0a946518cd41865cb1dce3b0c96fa00522beade1f4a8dfae5addf8554abfaab60c2d6b91999a3a85180eb45530b3fc74bd4456895519f29bd83e9c16a +SHA512 (kernel-kabi-dw-6.18.0.tar.xz) = 6922a91be5c99d231003b2b45a196c16d267f6b7119e79d723596e61b6ddcac016208fbc5db7a3f6bcbf71b0ed385cff52f3d161ae42366faf028e4945d6f2e6