From c834b455d0bb4bd2f27012d7dc8d5fe0da5f7db4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 5 Nov 2025 11:07:27 -0700 Subject: [PATCH] kernel-6.18.0-0.rc4.251105g1c353dc8d962d.39 * Wed Nov 05 2025 Fedora Kernel Team [6.18.0-0.rc4.1c353dc8d962.39] - rust: kbuild: workaround `rustdoc` doctests modifier bug (Miguel Ojeda) - rust: kbuild: treat `build_error` and `rustdoc` as kernel objects (Miguel Ojeda) - 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 | 12 ++++++------ kernel.changelog | 7 ++++++- kernel.spec | 16 ++++++++++------ patch-6.18-redhat.patch | 4 ++-- sources | 6 +++--- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index ead57e920..982e6006e 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 = 38 +RHEL_RELEASE = 39 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index e787d7f24..c4839d87c 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,11 +1,11 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/3ff2326ddff1e4a1ec7c170a85b1cec0e9f7aa27 - 3ff2326ddff1e4a1ec7c170a85b1cec0e9f7aa27 rust: kbuild: workaround `rustdoc` doctests modifier bug +https://gitlab.com/cki-project/kernel-ark/-/commit/6b0ff63b5d459c2abf7bb1455b71a0c4be1e4875 + 6b0ff63b5d459c2abf7bb1455b71a0c4be1e4875 rust: kbuild: workaround `rustdoc` doctests modifier bug -https://gitlab.com/cki-project/kernel-ark/-/commit/20430a2855766929d7fa608eae6d3e866e302750 - 20430a2855766929d7fa608eae6d3e866e302750 rust: kbuild: treat `build_error` and `rustdoc` as kernel objects +https://gitlab.com/cki-project/kernel-ark/-/commit/c86901f320b4b2a2dbcfe5ccaf9ba629b37d8d15 + c86901f320b4b2a2dbcfe5ccaf9ba629b37d8d15 rust: kbuild: treat `build_error` and `rustdoc` as kernel objects -https://gitlab.com/cki-project/kernel-ark/-/commit/9ab6be3f8a99729c211314177523deb1bc73b49c - 9ab6be3f8a99729c211314177523deb1bc73b49c powerpc/tools: drop `-o pipefail` in gcc check scripts +https://gitlab.com/cki-project/kernel-ark/-/commit/d81ef4b23d5416f4fc5ceab3fadf10d84a1f9791 + d81ef4b23d5416f4fc5ceab3fadf10d84a1f9791 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 9963f246e..0eea78cf1 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,10 +1,15 @@ -* Tue Nov 04 2025 Fedora Kernel Team [6.18.0-0.rc4.c9cfc122f037.38] +* Wed Nov 05 2025 Fedora Kernel Team [6.18.0-0.rc4.1c353dc8d962.39] - rust: kbuild: workaround `rustdoc` doctests modifier bug (Miguel Ojeda) - rust: kbuild: treat `build_error` and `rustdoc` as kernel objects (Miguel Ojeda) - powerpc/tools: drop `-o pipefail` in gcc check scripts (Jan Stancek) - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) Resolves: +* Wed Nov 05 2025 Fedora Kernel Team [6.18.0-0.rc4.1c353dc8d962.38] +- redhat: use RELEASE_LOCALVERSION also for dist-get-tag (Jan Stancek) +- Linux v6.18.0-0.rc4.1c353dc8d962 +Resolves: + * Tue Nov 04 2025 Fedora Kernel Team [6.18.0-0.rc4.c9cfc122f037.37] - redhat: configs: rhel: Enable OV08X40 sensor to support Intel MIPI camera (Kate Hsuan) - redhat: configs: rhel: Enable usbio-drivers to supower Intel MIPI camera (Kate Hsuan) diff --git a/kernel.spec b/kernel.spec index ec5b7a5f3..42936e2f6 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.rc4.251104gc9cfc122f0371.38 +%define pkgrelease 0.rc4.251105g1c353dc8d962d.39 %define kversion 6 -%define tarfile_release 6.18-rc4-7-gc9cfc122f0371 +%define tarfile_release 6.18-rc4-25-g1c353dc8d962d # This is needed to do merge window version magic %define patchlevel 18 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.251104gc9cfc122f0371.38%{?buildid}%{?dist} +%define specrelease 0.rc4.251105g1c353dc8d962d.39%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.18.0 @@ -4500,15 +4500,19 @@ fi\ # # %changelog -* Tue Nov 04 2025 Justin M. Forbes [6.18.0-0.rc4.251104gc9cfc122f0371.38] -- Linux v6.18.0-0.rc4.251104gc9cfc122f0371 +* Wed Nov 05 2025 Justin M. Forbes [6.18.0-0.rc4.251105g1c353dc8d962d.39] +- Linux v6.18.0-0.rc4.251105g1c353dc8d962d -* Tue Nov 04 2025 Fedora Kernel Team [6.18.0-0.rc4.c9cfc122f037.38] +* Wed Nov 05 2025 Fedora Kernel Team [6.18.0-0.rc4.1c353dc8d962.39] - rust: kbuild: workaround `rustdoc` doctests modifier bug (Miguel Ojeda) - rust: kbuild: treat `build_error` and `rustdoc` as kernel objects (Miguel Ojeda) - powerpc/tools: drop `-o pipefail` in gcc check scripts (Jan Stancek) - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) +* Wed Nov 05 2025 Fedora Kernel Team [6.18.0-0.rc4.1c353dc8d962.38] +- redhat: use RELEASE_LOCALVERSION also for dist-get-tag (Jan Stancek) +- Linux v6.18.0-0.rc4.1c353dc8d962 + * Tue Nov 04 2025 Fedora Kernel Team [6.18.0-0.rc4.c9cfc122f037.37] - redhat: configs: rhel: Enable OV08X40 sensor to support Intel MIPI camera (Kate Hsuan) - redhat: configs: rhel: Enable usbio-drivers to supower Intel MIPI camera (Kate Hsuan) diff --git a/patch-6.18-redhat.patch b/patch-6.18-redhat.patch index 381f3ecb4..31ba04330 100644 --- a/patch-6.18-redhat.patch +++ b/patch-6.18-redhat.patch @@ -430,10 +430,10 @@ index 892fce2b75497..eefbda45ac47a 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index c7d3512914ca9..3ad1a183d5397 100644 +index 02d97834a1d4d..4165e24261282 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -1757,6 +1757,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) +@@ -1761,6 +1761,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) get_cpu_vendor(c); intel_unlock_cpuid_leafs(c); get_cpu_cap(c); diff --git a/sources b/sources index a0b152eab..797470f75 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.18-rc4-7-gc9cfc122f0371.tar.xz) = 60406d0c40ff14f0841cebc0b4f74f31bf8d6d91107a6281897d6d0c1dc52b3a376a1b9ca84f12b6456eec775f6d414f151aefb228bef64db2e2205cdf3e0bb6 -SHA512 (kernel-abi-stablelists-6.18.0.tar.xz) = a1948661c86745a65648390935453edce5a0248b74a32f27e90af3f40e320a6556c9cad6030103f628611695683d36f431b63bba6bec168f977c00d1ae52c838 -SHA512 (kernel-kabi-dw-6.18.0.tar.xz) = 4df0709f0ebc3aca5112d8e91e3c437c5a6cbf4225aa48f3d2e1b20093ac4194e18ca1eb2f044eceec4cf3b18beec0d17275193f5bf75e50d18243e730c55645 +SHA512 (linux-6.18-rc4-25-g1c353dc8d962d.tar.xz) = e0a93ec7f5459a5c933743cb1512a510106b7abf36b4a4b3b9e95742379b36aedf280fb1ab2dabddf9d5a51b57c0ef4bd43a8528f989143e0ff49ee0fdd87313 +SHA512 (kernel-abi-stablelists-6.18.0.tar.xz) = 91c3197c36f8b10e19baf875b8f15a8e66322dd3587231d90b0626f62bf9f7536561d50ecbf4009d42491a36a8936ecbfb025c181ca454556c7a444f8bb72877 +SHA512 (kernel-kabi-dw-6.18.0.tar.xz) = 1e0cb18932238d2d43ce3600de9327d252ad55196837c46c6ad4526af233a169af91c88ac88eb017d5e9517b57a70156b22f969a372e5ecb8992a604e6b1fcf0