From dbb4c41c17287d29569b023bddddcdd682356cad Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 7 Jan 2025 12:35:11 -0700 Subject: [PATCH] kernel-6.13.0-0.rc6.20250107gitfbfd64d25c7a.49 * Tue Jan 07 2025 Fedora Kernel Team [6.13.0-0.rc6.fbfd64d25c7a.49] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 7 ++----- kernel.changelog | 6 +++++- kernel.spec | 14 +++++++------- patch-6.13-redhat.patch | 23 +---------------------- sources | 6 +++--- 6 files changed, 19 insertions(+), 39 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 076ae9c59..943e2e14a 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 = 49 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index d277b293c..58858f60e 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/e29147cd9976eb8eaf45ebc3b6e0eea59e727d1e - e29147cd9976eb8eaf45ebc3b6e0eea59e727d1e Revert "vmstat: disable vmstat_work on vmstat_cpu_down_prep()" - -https://gitlab.com/cki-project/kernel-ark/-/commit/f36dc0090c78cef00f283bc6f20a4b880a0ceeb5 - f36dc0090c78cef00f283bc6f20a4b880a0ceeb5 x86/insn_decoder_test: allow longer symbol-names +https://gitlab.com/cki-project/kernel-ark/-/commit/2470f117a1501c5dbc0a7cd2b9491f6ff80b94e6 + 2470f117a1501c5dbc0a7cd2b9491f6ff80b94e6 x86/insn_decoder_test: allow longer symbol-names https://gitlab.com/cki-project/kernel-ark/-/commit/4d11b5eee76ec8a293d0dce03f16995e5c94b07b 4d11b5eee76ec8a293d0dce03f16995e5c94b07b crypto: rng - Fix extrng EFAULT handling diff --git a/kernel.changelog b/kernel.changelog index 37213ad6d..d38324fc8 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,12 @@ -* Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.48] +* Tue Jan 07 2025 Fedora Kernel Team [6.13.0-0.rc6.fbfd64d25c7a.49] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: +* Tue Jan 07 2025 Fedora Kernel Team [6.13.0-0.rc6.fbfd64d25c7a.48] +- Linux v6.13.0-0.rc6.fbfd64d25c7a +Resolves: + * Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.47] - Linux v6.13.0-0.rc6 Resolves: diff --git a/kernel.spec b/kernel.spec index c9ace6c19..31d727cb9 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.rc6.48 +%define pkgrelease 0.rc6.20250107gitfbfd64d25c7a.49 %define kversion 6 -%define tarfile_release 6.13-rc6 +%define tarfile_release 6.13-rc6-36-gfbfd64d25c7a # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.48%{?buildid}%{?dist} +%define specrelease 0.rc6.20250107gitfbfd64d25c7a.49%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.13.0 @@ -4171,13 +4171,13 @@ fi\ # # %changelog -* Mon Jan 06 2025 Justin M. Forbes [6.13.0-0.rc6.48] -- Revert "vmstat: disable vmstat_work on vmstat_cpu_down_prep()" (Linus Torvalds) - -* Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.48] +* Tue Jan 07 2025 Fedora Kernel Team [6.13.0-0.rc6.fbfd64d25c7a.49] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) +* Tue Jan 07 2025 Fedora Kernel Team [6.13.0-0.rc6.fbfd64d25c7a.48] +- Linux v6.13.0-0.rc6.fbfd64d25c7a + * Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.47] - Linux v6.13.0-0.rc6 diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index 1e61c3aee..05df02b0b 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -77,14 +77,13 @@ kernel/rh_messages.c | 414 ++++++++++++++++ kernel/rh_messages.h | 326 +++++++++++++ kernel/rh_waived.c | 104 ++++ - mm/vmstat.c | 3 +- scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 86 files changed, 2765 insertions(+), 220 deletions(-) + 85 files changed, 2764 insertions(+), 218 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 3872bc6ec49d..b98a019b0dd0 100644 @@ -4588,26 +4587,6 @@ index 000000000000..84e22b1730cc + return 0; +} +late_initcall(__add_rh_flag); -diff --git a/mm/vmstat.c b/mm/vmstat.c -index 0889b75cef14..4d016314a56c 100644 ---- a/mm/vmstat.c -+++ b/mm/vmstat.c -@@ -2148,14 +2148,13 @@ static int vmstat_cpu_online(unsigned int cpu) - if (!node_state(cpu_to_node(cpu), N_CPU)) { - node_set_state(cpu_to_node(cpu), N_CPU); - } -- enable_delayed_work(&per_cpu(vmstat_work, cpu)); - - return 0; - } - - static int vmstat_cpu_down_prep(unsigned int cpu) - { -- disable_delayed_work_sync(&per_cpu(vmstat_work, cpu)); -+ cancel_delayed_work_sync(&per_cpu(vmstat_work, cpu)); - return 0; - } - diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 7ea59dc4926b..1cea58bf300d 100644 --- a/scripts/mod/modpost.c diff --git a/sources b/sources index cd42ac795..eb1377806 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-rc6.tar.xz) = 2523726653c6db611ae6e30c20a50dd811820d367f42449b28a5436b0449baf04c822007ae492f6039c096fd4dd4da0e02e07697f87261bab7d0bf7bf153a3fd -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 630a28d1cdf64764003d80df7fd1c13b6a3d24ebc3b14a28fc0c5c342cc8c202dd14953f2306384dedb1e9a836f18f41c23018ccf0ee347e13da6a335ef498d3 -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 102778ae43ad4247e4720795b1a101cdfa6aba28e1efc72bb38c7a89d867137e6bfbcab0cd4115f44c9c857b81d6e1f6039e5abdba088b25df380c54e5350006 +SHA512 (linux-6.13-rc6-36-gfbfd64d25c7a.tar.xz) = 90a8929f0def812f7e02ef5520a9cc075d620dc8100bf2d8557c120eb3d5ec85e52c61a2e16138906a6892b8b177b0295477d86410adac5bd117e1a1183e4255 +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 9f249dc647924c2838d09e20542618a68d50ca11781c7473cde268413d6b2e78eb478a78b75d773c4958d48731512b52d6a0f7eab25523b85ca321bd1ea50cff +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 674bbf6a5474de12c4ace10e8e9bac1145061a77c8727cf65674fbc47382df28c6596be06bdf278cacbf69ebab7b8ef2c791fc0c23f65062df2f4bdf84f576ae