diff --git a/Makefile.rhelver b/Makefile.rhelver index 9e42da42f..c9670fb00 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 = 22 +RHEL_RELEASE = 23 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 6d64a4eaf..d2f297d2d 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/1e390694b570ac27a43331cc2d924db0f9e3dabb - 1e390694b570ac27a43331cc2d924db0f9e3dabb x86/insn_decoder_test: allow longer symbol-names +https://gitlab.com/cki-project/kernel-ark/-/commit/bb051c808d208f8616d76529711fe3cf3f27e9c0 + bb051c808d208f8616d76529711fe3cf3f27e9c0 x86/insn_decoder_test: allow longer symbol-names https://gitlab.com/cki-project/kernel-ark/-/commit/c4589d81040a97b7adb381203b68b893f5df7b1c c4589d81040a97b7adb381203b68b893f5df7b1c crypto: sig - Disable signing diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 95b2b76e4..d9903ab0b 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6509,7 +6509,7 @@ CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m CONFIG_QCOM_CPUCP_MBOX=m # CONFIG_QCOM_EBI2 is not set -# CONFIG_QCOM_EMAC is not set +CONFIG_QCOM_EMAC=m # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index fb3022f3c..1f6992f57 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6482,7 +6482,7 @@ CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m CONFIG_QCOM_CPUCP_MBOX=m # CONFIG_QCOM_EBI2 is not set -# CONFIG_QCOM_EMAC is not set +CONFIG_QCOM_EMAC=m # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 3ad4514c4..85b5f68d0 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2169,7 +2169,6 @@ CONFIG_FIXED_PHY=y CONFIG_FM10K=m # CONFIG_FONTS is not set CONFIG_FONT_SUPPORT=y -CONFIG_FORCE_MAX_ZONEORDER=14 # CONFIG_FORCE_NR_CPUS is not set CONFIG_FORTIFY_KUNIT_TEST=m CONFIG_FORTIFY_SOURCE=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 28c496c6a..f68cadcbd 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2153,7 +2153,6 @@ CONFIG_FIXED_PHY=y CONFIG_FM10K=m # CONFIG_FONTS is not set CONFIG_FONT_SUPPORT=y -CONFIG_FORCE_MAX_ZONEORDER=14 # CONFIG_FORCE_NR_CPUS is not set CONFIG_FORTIFY_KUNIT_TEST=m CONFIG_FORTIFY_SOURCE=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index aaca5b043..9d711a580 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6508,7 +6508,7 @@ CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m CONFIG_QCOM_CPUCP_MBOX=m # CONFIG_QCOM_EBI2 is not set -# CONFIG_QCOM_EMAC is not set +CONFIG_QCOM_EMAC=m # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 425a0041d..932a2aa62 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6481,7 +6481,7 @@ CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m CONFIG_QCOM_CPUCP_MBOX=m # CONFIG_QCOM_EBI2 is not set -# CONFIG_QCOM_EMAC is not set +CONFIG_QCOM_EMAC=m # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 4d3d3f594..ae0865f7a 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -6516,7 +6516,7 @@ CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m CONFIG_QCOM_CPUCP_MBOX=m # CONFIG_QCOM_EBI2 is not set -# CONFIG_QCOM_EMAC is not set +CONFIG_QCOM_EMAC=m # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index f890e8175..2c1ad320e 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -6489,7 +6489,7 @@ CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m CONFIG_QCOM_CPUCP_MBOX=m # CONFIG_QCOM_EBI2 is not set -# CONFIG_QCOM_EMAC is not set +CONFIG_QCOM_EMAC=m # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set CONFIG_QCOM_FALKOR_ERRATUM_1009=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y diff --git a/kernel.changelog b/kernel.changelog index 2636a1b8e..4b3b0027b 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,15 @@ -* Mon Dec 09 2024 Fedora Kernel Team [6.13.0-0.rc2.22] +* Tue Dec 10 2024 Fedora Kernel Team [6.13.0-0.rc2.7cb1b4663150.23] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: +* Tue Dec 10 2024 Fedora Kernel Team [6.13.0-0.rc2.7cb1b4663150.22] +- gitlab-ci: disable clang CI pipelines (Scott Weaver) +- redhat/configs: Remove obsolete arch64/64k/CONFIG_FORCE_MAX_ZONEORDER (Waiman Long) +- Fix up QCOM_EMAC config for Fedora (Justin M. Forbes) +- Linux v6.13.0-0.rc2.7cb1b4663150 +Resolves: + * Mon Dec 09 2024 Fedora Kernel Team [6.13.0-0.rc2.21] - redhat/configs: automotive: disable CONFIG_IO_URING (Ian Mullins) - Linux v6.13.0-0.rc2 diff --git a/kernel.spec b/kernel.spec index 69a0c6536..b64c7e898 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.13.0 %define specversion 6.13.0 %define patchversion 6.13 -%define pkgrelease 0.rc2.22 +%define pkgrelease 0.rc2.20241210git7cb1b4663150.23 %define kversion 6 -%define tarfile_release 6.13-rc2 +%define tarfile_release 6.13-rc2-18-g7cb1b4663150 # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.22%{?buildid}%{?dist} +%define specrelease 0.rc2.20241210git7cb1b4663150.23%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.13.0 @@ -4171,10 +4171,16 @@ fi\ # # %changelog -* Mon Dec 09 2024 Fedora Kernel Team [6.13.0-0.rc2.22] +* Tue Dec 10 2024 Fedora Kernel Team [6.13.0-0.rc2.7cb1b4663150.23] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) +* Tue Dec 10 2024 Fedora Kernel Team [6.13.0-0.rc2.7cb1b4663150.22] +- gitlab-ci: disable clang CI pipelines (Scott Weaver) +- redhat/configs: Remove obsolete arch64/64k/CONFIG_FORCE_MAX_ZONEORDER (Waiman Long) +- Fix up QCOM_EMAC config for Fedora (Justin M. Forbes) +- Linux v6.13.0-0.rc2.7cb1b4663150 + * Mon Dec 09 2024 Fedora Kernel Team [6.13.0-0.rc2.21] - redhat/configs: automotive: disable CONFIG_IO_URING (Ian Mullins) - Linux v6.13.0-0.rc2 diff --git a/partial-clang_lto-aarch64-debug-snip.config b/partial-clang_lto-aarch64-debug-snip.config index ff106f394..5983d58b6 100644 --- a/partial-clang_lto-aarch64-debug-snip.config +++ b/partial-clang_lto-aarch64-debug-snip.config @@ -1,4 +1,6 @@ # clang_lto +# CONFIG_AUTOFDO_CLANG is not set # CONFIG_DRM_WERROR is not set CONFIG_KASAN_STACK=y # CONFIG_KMSAN is not set +# CONFIG_PROPELLER_CLANG is not set diff --git a/partial-clang_lto-x86_64-debug-snip.config b/partial-clang_lto-x86_64-debug-snip.config index ff106f394..5983d58b6 100644 --- a/partial-clang_lto-x86_64-debug-snip.config +++ b/partial-clang_lto-x86_64-debug-snip.config @@ -1,4 +1,6 @@ # clang_lto +# CONFIG_AUTOFDO_CLANG is not set # CONFIG_DRM_WERROR is not set CONFIG_KASAN_STACK=y # CONFIG_KMSAN is not set +# CONFIG_PROPELLER_CLANG is not set diff --git a/partial-clang_lto-x86_64-snip.config b/partial-clang_lto-x86_64-snip.config index ebab7f73c..768d20ca3 100644 --- a/partial-clang_lto-x86_64-snip.config +++ b/partial-clang_lto-x86_64-snip.config @@ -1,6 +1,8 @@ # clang_lto +# CONFIG_AUTOFDO_CLANG is not set # CONFIG_DRM_WERROR is not set # CONFIG_KASAN_STACK is not set # CONFIG_KMSAN is not set CONFIG_LTO_CLANG_THIN=y # CONFIG_LTO_NONE is not set +# CONFIG_PROPELLER_CLANG is not set diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index 0fe16618c..7716215aa 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -86,10 +86,10 @@ 85 files changed, 2765 insertions(+), 218 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index dc663c0ca670..9f805c864d30 100644 +index 3872bc6ec49d..b98a019b0dd0 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5878,6 +5878,17 @@ +@@ -5883,6 +5883,17 @@ 2 The "airplane mode" button toggles between everything blocked and everything unblocked. @@ -107,7 +107,7 @@ index dc663c0ca670..9f805c864d30 100644 ring3mwait=disable [KNL] Disable ring 3 MONITOR/MWAIT feature on supported CPUs. -@@ -7153,6 +7164,15 @@ +@@ -7158,6 +7169,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. diff --git a/sources b/sources index 768307c19..3a99d722e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-rc2.tar.xz) = a4021c258172c1b58d7964285b73f01b7566238cb74655030164209e8400e886a36cf43aefc7b2e2b16481de9b52d79c9baaf89116bc4ffa8253a8abd587d0ff -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 92eda59ce85f0c133ad0c1c9fa08aca8accc8b37e544e7e9a75030cf0e566e4591a2a0e16b73c2af11a5722b405b1a5aac3c2df8d71dd9004d141cb479e9ecf3 -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 4235c3fde59117b97d04f8b345bc8403337dd8a8f4fca96bfa50b687da5b43ac528f8d0c0787b263f3775abdc6beacf87b80cf150f3f0098c7f20071aacc8e9c +SHA512 (linux-6.13-rc2-18-g7cb1b4663150.tar.xz) = 63195b59c8a17eca88d2a7a75d5d0eccdcbdca3bf100289ef464e92c99e3898d8f9201d2904778a4f9539df72dc06e1fae97ec327ffa1807cb78bfa07334c6c0 +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 4ec6ea0ba7c3e5a21b755be9f8904b6eb6f456d55fd96b18183e6ccb30950d651d6ab034a6757895efc07aa10820da178db193076855671e4c4f39ab053e61ed +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 0c0d65edf040be21ce549573ddafa24247c62667eb89ef9ce754f0cbb3e2238b5dee47d49205b44cad2ad659259951dcf9c91bfd0853ca43884d70cc670fc512