diff --git a/Makefile.rhelver b/Makefile.rhelver index 076ae9c59..9826d97f6 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/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index dca954a36..bdd2b32c3 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -1413,6 +1413,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y # CONFIG_CRAMFS is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 9c99acc48..b56c60bde 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -1413,6 +1413,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y # CONFIG_CRAMFS is not set diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index f7b7c0788..897f588fd 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1072,6 +1072,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y # CONFIG_CRAMFS is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 19d8ae87b..ad4cb3fd9 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1072,6 +1072,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y # CONFIG_CRAMFS is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index f85756aa5..10fb414c5 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1413,6 +1413,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y # CONFIG_CRAMFS is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 52b8c4a9a..78ef62c7e 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1070,6 +1070,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y # CONFIG_CRAMFS is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 772a0b696..3173c4392 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1413,6 +1413,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y # CONFIG_CRAMFS is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index fad5a0507..02906bd62 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1070,6 +1070,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y # CONFIG_CRAMFS is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index ba0eed363..9f258aaaf 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1070,6 +1070,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y CONFIG_CRAMFS_BLOCKDEV=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index de1a68d31..9d38e7f6e 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1070,6 +1070,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_THERMAL=y CONFIG_CRAMFS_BLOCKDEV=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 0be753219..a76009bd4 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1025,6 +1025,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index d491cc8c0..fbd99884f 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -881,6 +881,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m # CONFIG_CPUMASK_OFFSTACK is not set +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 1b0ee9069..62be99568 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1023,6 +1023,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index adb4a7d33..cb8ccadc6 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -881,6 +881,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m # CONFIG_CPUMASK_OFFSTACK is not set +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 7752207ed..4c8a623d9 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1031,6 +1031,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 6d96ecb9c..6f235b46f 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -880,6 +880,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 83989dd3d..9dd8759a0 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1029,6 +1029,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d24e651c4..3982cabe1 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -880,6 +880,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 9f3f79a58..34d48d50a 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -882,6 +882,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y # CONFIG_CPUSETS is not set # CONFIG_CPU_THERMAL is not set # CONFIG_CRAMFS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 1317ec1d2..9ab6a2e2b 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1099,6 +1099,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_SRSO=y # CONFIG_CPU_THERMAL is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index df0719cf0..23cefb066 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -917,6 +917,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_SRSO=y # CONFIG_CPU_THERMAL is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 3d979ac81..8cc8c0990 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1097,6 +1097,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_SRSO=y # CONFIG_CPU_THERMAL is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index a5f222c60..f331043d6 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -917,6 +917,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_SRSO=y # CONFIG_CPU_THERMAL is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 9b30223da..8a2d03bac 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -917,6 +917,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_SRSO=y # CONFIG_CPU_THERMAL is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 71109c01e..99b0eb0ec 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -917,6 +917,7 @@ CONFIG_CPU_ISOLATION=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_KUNIT_TEST=m CONFIG_CPUMASK_OFFSTACK=y +CONFIG_CPU_MITIGATIONS=y CONFIG_CPUSETS=y CONFIG_CPU_SRSO=y # CONFIG_CPU_THERMAL is not set diff --git a/kernel.changelog b/kernel.changelog index b2883a571..d4445b32a 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,16 @@ +* Mon Apr 29 2024 Fedora Kernel Team [6.9.0-0.rc6.51] +- gitlab-ci: enable pipelines with c10s buildroot (Michael Hofmann) +- Linux v6.9.0-0.rc6 +Resolves: + +* Sun Apr 28 2024 Fedora Kernel Team [6.9.0-0.rc5.2c8159388952.50] +- Linux v6.9.0-0.rc5.2c8159388952 +Resolves: + +* Sat Apr 27 2024 Fedora Kernel Team [6.9.0-0.rc5.5eb4573ea63d.49] +- Linux v6.9.0-0.rc5.5eb4573ea63d +Resolves: + * Fri Apr 26 2024 Fedora Kernel Team [6.9.0-0.rc5.c942a0cd3603.48] - Turn on ISM for Fedora (Justin M. Forbes) - Linux v6.9.0-0.rc5.c942a0cd3603 diff --git a/kernel.spec b/kernel.spec index e8b913f23..043776d3d 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.rc5.20240426gitc942a0cd3603.48 +%define pkgrelease 0.rc6.51 %define kversion 6 -%define tarfile_release 6.9-rc5-159-gc942a0cd3603 +%define tarfile_release 6.9-rc6 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20240426gitc942a0cd3603.48%{?buildid}%{?dist} +%define specrelease 0.rc6.51%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3935,6 +3935,16 @@ fi\ # # %changelog +* Mon Apr 29 2024 Fedora Kernel Team [6.9.0-0.rc6.51] +- gitlab-ci: enable pipelines with c10s buildroot (Michael Hofmann) +- Linux v6.9.0-0.rc6 + +* Sun Apr 28 2024 Fedora Kernel Team [6.9.0-0.rc5.2c8159388952.50] +- Linux v6.9.0-0.rc5.2c8159388952 + +* Sat Apr 27 2024 Fedora Kernel Team [6.9.0-0.rc5.5eb4573ea63d.49] +- Linux v6.9.0-0.rc5.5eb4573ea63d + * Fri Apr 26 2024 Fedora Kernel Team [6.9.0-0.rc5.c942a0cd3603.48] - Turn on ISM for Fedora (Justin M. Forbes) - Linux v6.9.0-0.rc5.c942a0cd3603 diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index ca6d8c6c9..129bc888a 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -74,10 +74,10 @@ 73 files changed, 2357 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 902ecd92a29f..23bd65b59904 100644 +index 213d0719e2b7..c3495f6bbfdc 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6890,6 +6890,15 @@ +@@ -6893,6 +6893,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -136,7 +136,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 43b10f3d438c..b2fcd099c968 100644 +index 40fb2ca6fe4c..0eb7348422fb 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 872754fe1..327389dbe 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-rc5-159-gc942a0cd3603.tar.xz) = e38b2418bc9342d2e0e0c2af30723c3e2cab127e9fffe8c814231bc574a56aa490cbe74542cd780161602fe9a0dc30b9239b1c263b42ee5c26b66e2bb49b19fb -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = a3111c2ab7d431704c978ae10a5fb719a1064ea99df3ecf0a53f866178e999e8ce941265bc2651e845a2eb0be65e03c9d3e927b3194756af3b05d2379a113854 -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 9cf1e9436712b1caa9a318123d22a831faf4f75b530fd9ed0deca228bd9cfa602d17b6a9d248a7908de6ae635238c63c0c46c3c9aeeea78c6cf694bc6af5062d +SHA512 (linux-6.9-rc6.tar.xz) = f204fea5b89b217eea56a039bf2473a9a2360559710bdf02eb815f997eebcbbed5db4add17b47683d4a03421f98fd22dc9b70156d5ddb9065a8aceb0bd27b3fa +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 9cde9f619c5a80a2159b79a79a7f9d6c46bdb310a41eabe46abc720c5b98675eed272b916e0f282c78dceab7d6954f9f985528975cbf1bd956234d18d0c6016e +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 45ee6f59f66f71dc43d4014a2dd3c4c3793cb56438bcb5427c23d3abb731c3ba0318386ab34cbb9ccc96f81b6be50b3a36a5d156d556823e8c4785989d1cf5ce