diff --git a/Makefile.rhelver b/Makefile.rhelver index 2a89f3ab5..14cf5d817 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 = 4 +RHEL_RELEASE = 5 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 6fc6ac7f5..b1715cecf 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,23 +1,23 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/2b9bfb4a17365969edd45e66e71f44918b120083 - 2b9bfb4a17365969edd45e66e71f44918b120083 redhat: fix modules.order target +https://gitlab.com/cki-project/kernel-ark/-/commit/a072321e6ef700d12dea7ccf227619db24ed37ea + a072321e6ef700d12dea7ccf227619db24ed37ea apply -Wno-error=unterminated-string-initialization temporarily -https://gitlab.com/cki-project/kernel-ark/-/commit/e46a2c036a7c43c7f530698270b4ab90d224d34a - e46a2c036a7c43c7f530698270b4ab90d224d34a apply -Wno-error=unterminated-string-initialization temporarily +https://gitlab.com/cki-project/kernel-ark/-/commit/2a8eb2ea38dd32a2463525071884be6f69971540 + 2a8eb2ea38dd32a2463525071884be6f69971540 efi: libstub: Use '-std=gnu11' to fix build with GCC 15 -https://gitlab.com/cki-project/kernel-ark/-/commit/316e55ac2b28d0975ab1e450a3e2ba74e95113fd - 316e55ac2b28d0975ab1e450a3e2ba74e95113fd efi: libstub: Use '-std=gnu11' to fix build with GCC 15 +https://gitlab.com/cki-project/kernel-ark/-/commit/3438550b00d0be20442cf0cecd094459903f6df1 + 3438550b00d0be20442cf0cecd094459903f6df1 x86/boot: Use '-std=gnu11' to fix build with GCC 15 -https://gitlab.com/cki-project/kernel-ark/-/commit/fe5bb7b4a04f64365f66f3914b1dfe26a290e89c - fe5bb7b4a04f64365f66f3914b1dfe26a290e89c x86/boot: Use '-std=gnu11' to fix build with GCC 15 +https://gitlab.com/cki-project/kernel-ark/-/commit/7e952aad43f252aaa3d343bc49b700e63f8495e6 + 7e952aad43f252aaa3d343bc49b700e63f8495e6 kbuild: Use -fzero-init-padding-bits=all -https://gitlab.com/cki-project/kernel-ark/-/commit/37c5bad94d0d9d6bee79a47e60afcc475d8dc1ab - 37c5bad94d0d9d6bee79a47e60afcc475d8dc1ab kbuild: Use -fzero-init-padding-bits=all +https://gitlab.com/cki-project/kernel-ark/-/commit/8e1d1442fdfce3c9c97d00fa2e5807fa4f9c519d + 8e1d1442fdfce3c9c97d00fa2e5807fa4f9c519d include/linux: Adjust headers for C23 -https://gitlab.com/cki-project/kernel-ark/-/commit/cd7fb64101b9f5a7b107bafc32d80fee91f62779 - cd7fb64101b9f5a7b107bafc32d80fee91f62779 include/linux: Adjust headers for C23 +https://gitlab.com/cki-project/kernel-ark/-/commit/9765a4fd8fe40ad0617dc549f3b5ff4ec8af5893 + 9765a4fd8fe40ad0617dc549f3b5ff4ec8af5893 x86/insn_decoder_test: allow longer symbol-names -https://gitlab.com/cki-project/kernel-ark/-/commit/dd524efdf9c58c7fdb7c52ddbfc41ddbc0498d65 - dd524efdf9c58c7fdb7c52ddbfc41ddbc0498d65 x86/insn_decoder_test: allow longer symbol-names +https://gitlab.com/cki-project/kernel-ark/-/commit/f5d07781f06dafc7108274ddf996e39f6de4e062 + f5d07781f06dafc7108274ddf996e39f6de4e062 redhat: fix modules.order target https://gitlab.com/cki-project/kernel-ark/-/commit/b8920e37d1e4c5fdbe8b990b829f79dd84e2ccf8 b8920e37d1e4c5fdbe8b990b829f79dd84e2ccf8 [redhat] rh_messages.h: driver and device updates diff --git a/kernel.changelog b/kernel.changelog index 7ab368702..bdeff7d46 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,15 +1,19 @@ -* Thu Jan 23 2025 Fedora Kernel Team [6.14.0-0.rc0.d0d106a2bd21.4] -- redhat: fix modules.order target (Scott Weaver) +* Fri Jan 24 2025 Fedora Kernel Team [6.14.0-0.rc0.bc8198dc7ebc.5] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) - efi: libstub: Use '-std=gnu11' to fix build with GCC 15 (Nathan Chancellor) - x86/boot: Use '-std=gnu11' to fix build with GCC 15 (Nathan Chancellor) - kbuild: Use -fzero-init-padding-bits=all (Kees Cook) - include/linux: Adjust headers for C23 (Jakub Jelinek) -- redhat: kernel.spec: fix build with merged-sbin (Adam Williamson) +- redhat: kernel.spec: fix build with merged-sbin (Zbigniew Jędrzejewski-Szmek) - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: +* Fri Jan 24 2025 Fedora Kernel Team [6.14.0-0.rc0.bc8198dc7ebc.4] +- redhat: fix modules.order target (Scott Weaver) +- Linux v6.14.0-0.rc0.bc8198dc7ebc +Resolves: + * Thu Jan 23 2025 Fedora Kernel Team [6.14.0-0.rc0.d0d106a2bd21.3] - Fix up CONFIG_CRC_T10DIF_IMPL_GENERIC mismatch (Justin M. Forbes) - Fix mismatches for 6.13 merge window (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index 77293670b..2fdceb4c4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.14.0 %define specversion 6.14.0 %define patchversion 6.14 -%define pkgrelease 0.rc0.20250123gitd0d106a2bd21.4 +%define pkgrelease 0.rc0.20250124gitbc8198dc7ebc.5 %define kversion 6 -%define tarfile_release 6.13-5001-gd0d106a2bd21 +%define tarfile_release 6.13-5252-gbc8198dc7ebc # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20250123gitd0d106a2bd21.4%{?buildid}%{?dist} +%define specrelease 0.rc0.20250124gitbc8198dc7ebc.5%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.14.0 @@ -4174,17 +4174,20 @@ fi\ # # %changelog -* Thu Jan 23 2025 Fedora Kernel Team [6.14.0-0.rc0.d0d106a2bd21.4] -- redhat: fix modules.order target (Scott Weaver) +* Fri Jan 24 2025 Fedora Kernel Team [6.14.0-0.rc0.bc8198dc7ebc.5] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) - efi: libstub: Use '-std=gnu11' to fix build with GCC 15 (Nathan Chancellor) - x86/boot: Use '-std=gnu11' to fix build with GCC 15 (Nathan Chancellor) - kbuild: Use -fzero-init-padding-bits=all (Kees Cook) - include/linux: Adjust headers for C23 (Jakub Jelinek) -- redhat: kernel.spec: fix build with merged-sbin (Adam Williamson) +- redhat: kernel.spec: fix build with merged-sbin (Zbigniew Jędrzejewski-Szmek) - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) +* Fri Jan 24 2025 Fedora Kernel Team [6.14.0-0.rc0.bc8198dc7ebc.4] +- redhat: fix modules.order target (Scott Weaver) +- Linux v6.14.0-0.rc0.bc8198dc7ebc + * Thu Jan 23 2025 Fedora Kernel Team [6.14.0-0.rc0.d0d106a2bd21.3] - Fix up CONFIG_CRC_T10DIF_IMPL_GENERIC mismatch (Justin M. Forbes) - Fix mismatches for 6.13 merge window (Justin M. Forbes) diff --git a/patch-6.14-redhat.patch b/patch-6.14-redhat.patch index 4f5143215..9fb116753 100644 --- a/patch-6.14-redhat.patch +++ b/patch-6.14-redhat.patch @@ -92,7 +92,7 @@ 91 files changed, 2787 insertions(+), 219 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 73f2b3b0f4a5..1b8d4e0f25fd 100644 +index 8fbb481db515..e024e6a4c205 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6177,6 +6177,17 @@ @@ -113,7 +113,7 @@ index 73f2b3b0f4a5..1b8d4e0f25fd 100644 ring3mwait=disable [KNL] Disable ring 3 MONITOR/MWAIT feature on supported CPUs. -@@ -7461,6 +7472,15 @@ +@@ -7469,6 +7480,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -2556,10 +2556,10 @@ index f5956474bfde..d8b90cf0948b 100644 } diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index fdf4817a7dbc..98087c08f3d9 100644 +index a50e5c31b937..afddbfa816f9 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -5627,6 +5627,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) +@@ -5630,6 +5630,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) atomic_set(&sbi->s_warning_count, 0); atomic_set(&sbi->s_msg_count, 0); diff --git a/sources b/sources index 831ffd325..a53aff001 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-5001-gd0d106a2bd21.tar.xz) = 713a75b9ca662740873dcd058402528df936fd58812bbe19aca2ff506942c2252221fa96a5bcecd1e9a78585b18ae2079ae0af35c27b8ca6661ca031538b0e37 -SHA512 (kernel-abi-stablelists-6.14.0.tar.xz) = 00a78aa19d89c27f8ff083b1a9c311545a81dd2641bfacabfc1b95dfc7348fef9cf69d88434a22af2af83a976061895bc499844cd1ac81b4b437eafcbd84cc7f -SHA512 (kernel-kabi-dw-6.14.0.tar.xz) = 2ee0d4fdbb6237202019c49fa82343bed228f60f92f9a42f0854b4ade51ab7184afac1f17b6d1d2799308006938dc3fa05a97c694836bcf213875530dae70b97 +SHA512 (linux-6.13-5252-gbc8198dc7ebc.tar.xz) = 398cf44372d93fac898e64f20d510e0458dc75001bbf64fff6e9d3f8974091e434f22c6027bc6624c2c352ec6c1b6efcb06d3930f05657b8538f29f3f8b9bb7e +SHA512 (kernel-abi-stablelists-6.14.0.tar.xz) = f532f9339c6c39120f9202ecebcf45e7df08aa258f8708cb0432bc4e6296b73bc686914214e7751a6734f4ddbcb6950960ba2d66977dae06f5687168001c4044 +SHA512 (kernel-kabi-dw-6.14.0.tar.xz) = a8f61234808d10105b90f0f9a50db767388cf353a96ce5b1b36f0cd8f83e421a16037a095939804c237f68f79bb83577a7a9836d0d9b6f7a1dcfb415c64a80f4