From 49bdca4d2903f4daf248146f32845263f69e0548 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 6 Jan 2025 07:38:13 -0700 Subject: [PATCH] kernel-6.13.0-0.rc6.48 * Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.48] - 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 | 4 ++-- kernel.changelog | 26 +++++++++++++++++++++++++- kernel.spec | 26 ++++++++++++++++++++++---- patch-6.13-redhat.patch | 10 +++++----- sources | 6 +++--- 6 files changed, 58 insertions(+), 16 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 9e1fac485..076ae9c59 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 = 42 +RHEL_RELEASE = 48 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 969efa9eb..18aba62cd 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/f777e3353a60679967787aa8e37d0fe575b44b72 - f777e3353a60679967787aa8e37d0fe575b44b72 x86/insn_decoder_test: allow longer symbol-names +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/4d11b5eee76ec8a293d0dce03f16995e5c94b07b 4d11b5eee76ec8a293d0dce03f16995e5c94b07b crypto: rng - Fix extrng EFAULT handling diff --git a/kernel.changelog b/kernel.changelog index 9a4fd6e2f..37213ad6d 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,32 @@ -* Mon Dec 30 2024 Fedora Kernel Team [6.13.0-0.rc5.42] +* Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.48] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: +* Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.47] +- Linux v6.13.0-0.rc6 +Resolves: + +* Sun Jan 05 2025 Fedora Kernel Team [6.13.0-0.rc5.ab75170520d4.46] +- Linux v6.13.0-0.rc5.ab75170520d4 +Resolves: + +* Sat Jan 04 2025 Fedora Kernel Team [6.13.0-0.rc5.63676eefb7a0.45] +- Linux v6.13.0-0.rc5.63676eefb7a0 +Resolves: + +* Fri Jan 03 2025 Fedora Kernel Team [6.13.0-0.rc5.0bc21e701a6f.44] +- Linux v6.13.0-0.rc5.0bc21e701a6f +Resolves: + +* Thu Jan 02 2025 Fedora Kernel Team [6.13.0-0.rc5.56e6a3499e14.43] +- Linux v6.13.0-0.rc5.56e6a3499e14 +Resolves: + +* Tue Dec 31 2024 Fedora Kernel Team [6.13.0-0.rc5.ccb98ccef0e5.42] +- Linux v6.13.0-0.rc5.ccb98ccef0e5 +Resolves: + * Mon Dec 30 2024 Fedora Kernel Team [6.13.0-0.rc5.41] - Linux v6.13.0-0.rc5 Resolves: diff --git a/kernel.spec b/kernel.spec index 14957b7ff..36b60d570 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.rc5.42 +%define pkgrelease 0.rc6.48 %define kversion 6 -%define tarfile_release 6.13-rc5 +%define tarfile_release 6.13-rc6 # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.42%{?buildid}%{?dist} +%define specrelease 0.rc6.48%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.13.0 @@ -4171,10 +4171,28 @@ fi\ # # %changelog -* Mon Dec 30 2024 Fedora Kernel Team [6.13.0-0.rc5.42] +* Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.48] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) +* Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.47] +- Linux v6.13.0-0.rc6 + +* Sun Jan 05 2025 Fedora Kernel Team [6.13.0-0.rc5.ab75170520d4.46] +- Linux v6.13.0-0.rc5.ab75170520d4 + +* Sat Jan 04 2025 Fedora Kernel Team [6.13.0-0.rc5.63676eefb7a0.45] +- Linux v6.13.0-0.rc5.63676eefb7a0 + +* Fri Jan 03 2025 Fedora Kernel Team [6.13.0-0.rc5.0bc21e701a6f.44] +- Linux v6.13.0-0.rc5.0bc21e701a6f + +* Thu Jan 02 2025 Fedora Kernel Team [6.13.0-0.rc5.56e6a3499e14.43] +- Linux v6.13.0-0.rc5.56e6a3499e14 + +* Tue Dec 31 2024 Fedora Kernel Team [6.13.0-0.rc5.ccb98ccef0e5.42] +- Linux v6.13.0-0.rc5.ccb98ccef0e5 + * Mon Dec 30 2024 Fedora Kernel Team [6.13.0-0.rc5.41] - Linux v6.13.0-0.rc5 diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index df92c0c2a..05df02b0b 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -190,7 +190,7 @@ index 000000000000..fd77bd5c97e2 + +endmenu diff --git a/Makefile b/Makefile -index 48e89108aa58..9116bd960c6e 100644 +index 7904d5d88088..d21098c084ed 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -2096,10 +2096,10 @@ index a85d190942bd..b974ea81b62c 100644 /* initialize this in the identify path to cover controller resets */ diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 611b02c8a8b3..bd165f2afd7d 100644 +index c4bb8dfe1a45..a17435a61ed3 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -948,6 +948,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -953,6 +953,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_failover_req(struct request *req); @@ -2107,7 +2107,7 @@ index 611b02c8a8b3..bd165f2afd7d 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid); -@@ -990,6 +991,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -995,6 +996,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } @@ -4588,7 +4588,7 @@ index 000000000000..84e22b1730cc +} +late_initcall(__add_rh_flag); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 94ee49207a45..e1af88a08e5e 100644 +index 7ea59dc4926b..1cea58bf300d 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -27,6 +27,7 @@ diff --git a/sources b/sources index 008088a9f..f5b07698e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-rc5.tar.xz) = f9ceb3297c0124397c000a139e1323881086813a3c37abf75b712b3866100db585444004cfdabdc1de8f9dce27eb9b6ed948608a76e3944ec530c4e5e1945f61 -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 67e1c68d714bd1c62a64f1fa09d760c73735f2525de95462f16501efd1096512b3b85f34634f88fb10ab916b5bc7af14d3454cd173f53fba71f02166517e22c1 -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 214b1462326261f52f45054d6dec3abf9ce27a990d0236f7d2f86f516ac18396c44f41d9d0cbe0536e64ec50f18219ceb6efab1029e491ac05c313b0a3c59130 +SHA512 (linux-6.13-rc6.tar.xz) = 2523726653c6db611ae6e30c20a50dd811820d367f42449b28a5436b0449baf04c822007ae492f6039c096fd4dd4da0e02e07697f87261bab7d0bf7bf153a3fd +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 74ea2297c555be4ea8f1e4305cf1ffbdbee9e3d20c28a9e5d664d5e0b80dd121eebedfc20fe5f26dc633cc6da39d604562de3d77a45dd18fa6f1e8961450e0aa +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 455f39b1bcc120243c221ab62c7614fb516dd516549fc1fe5d298125c02e4a6e44fcb4415a07ba694178354d4e53bc569b28366b3b499597b753c90c6e82f938