diff --git a/Makefile.rhelver b/Makefile.rhelver index 64f1f44ac..1232f7a10 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 = 30 +RHEL_RELEASE = 31 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 5e52d2c31..4fb7f3d56 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/8c3224fe588f87498dd9dbd383ebe85a9b311102 - 8c3224fe588f87498dd9dbd383ebe85a9b311102 x86/insn_decoder_test: allow longer symbol-names +https://gitlab.com/cki-project/kernel-ark/-/commit/5aa158e6af62c15af2b5d012b14ef4180a366a56 + 5aa158e6af62c15af2b5d012b14ef4180a366a56 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 ef7e9799d..a5bad6a96 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,12 @@ -* Tue Dec 17 2024 Fedora Kernel Team [6.13.0-0.rc3.f44d154d6e3d.30] +* Wed Dec 18 2024 Fedora Kernel Team [6.13.0-0.rc3.aef25be35d23.31] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: +* Wed Dec 18 2024 Fedora Kernel Team [6.13.0-0.rc3.aef25be35d23.30] +- Linux v6.13.0-0.rc3.aef25be35d23 +Resolves: + * Tue Dec 17 2024 Fedora Kernel Team [6.13.0-0.rc3.f44d154d6e3d.29] - redhat/configs: Re-enable CONFIG_INFINIBAND_VMWARE_PVRDMA (Vitaly Kuznetsov) - redhat/configs: PREEMPT_NOTIFIERS does not need to be explicitly listed (Michal Schmidt) diff --git a/kernel.spec b/kernel.spec index e79e8e13f..07638244e 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.rc3.20241217gitf44d154d6e3d.30 +%define pkgrelease 0.rc3.20241218gitaef25be35d23.31 %define kversion 6 -%define tarfile_release 6.13-rc3-17-gf44d154d6e3d +%define tarfile_release 6.13-rc3-44-gaef25be35d23 # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20241217gitf44d154d6e3d.30%{?buildid}%{?dist} +%define specrelease 0.rc3.20241218gitaef25be35d23.31%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.13.0 @@ -4171,10 +4171,13 @@ fi\ # # %changelog -* Tue Dec 17 2024 Fedora Kernel Team [6.13.0-0.rc3.f44d154d6e3d.30] +* Wed Dec 18 2024 Fedora Kernel Team [6.13.0-0.rc3.aef25be35d23.31] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) +* Wed Dec 18 2024 Fedora Kernel Team [6.13.0-0.rc3.aef25be35d23.30] +- Linux v6.13.0-0.rc3.aef25be35d23 + * Tue Dec 17 2024 Fedora Kernel Team [6.13.0-0.rc3.f44d154d6e3d.29] - redhat/configs: Re-enable CONFIG_INFINIBAND_VMWARE_PVRDMA (Vitaly Kuznetsov) - redhat/configs: PREEMPT_NOTIFIERS does not need to be explicitly listed (Michal Schmidt) diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index be2a2e19e..d34ff13de 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -311,7 +311,7 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index edbb52ce3f1e..479cf8a4a576 100644 +index 7d12a1305fc9..569b92def9b7 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2497,3 +2497,8 @@ int ipl_report_free(struct ipl_report *report) @@ -346,7 +346,7 @@ index a3fea683b227..a3162d93f437 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index a5c28975c608..93ca6c869b90 100644 +index 3e9037690814..70735c08dd33 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1597,6 +1597,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) @@ -2498,10 +2498,10 @@ index a14f6013e316..6c20453fdf76 100644 error_proc: diff --git a/fs/erofs/super.c b/fs/erofs/super.c -index c235a8e4315e..d47f4da38c00 100644 +index f5956474bfde..d8b90cf0948b 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c -@@ -576,6 +576,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -581,6 +581,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) { struct inode *inode; struct erofs_sb_info *sbi = EROFS_SB(sb); @@ -2511,7 +2511,7 @@ index c235a8e4315e..d47f4da38c00 100644 int err; sb->s_magic = EROFS_SUPER_MAGIC; -@@ -687,6 +690,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) +@@ -691,6 +694,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) return err; erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid); diff --git a/sources b/sources index 014d923e8..3f6f8e599 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-rc3-17-gf44d154d6e3d.tar.xz) = 8937094826d720dc3a237622ffc28cb7f3d09a5553ded1835f48d3b16513604b5d05400da5f306cff71bfc36344f98b223a9468123a1012665186fe2b90704d0 -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 6411d9a9f5137ccaeadc4dbdc4c21d227e2fc70747e9c7ed8080ccb99cee3fbdf380bf3f434b5a3881aa53f47bc2b4527fc277b1ed0020d23f55a16213abcc29 -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 00223cfee9d80e93a15e6d5301066e8f2536f1751bc591a39d7e5b345f10474ad4c8ed848a917dc8eab194344da6bb11c8e662ad495c0894f052ed8905706bf5 +SHA512 (linux-6.13-rc3-44-gaef25be35d23.tar.xz) = 5e1e6f76b8973c295881f1d9ccc8226738f29ee20be8e367a503e1b1558c630c34aac4b451aea0cfaa58d6d445ca118d032d846dcc7eecf35217015c51bcb9a9 +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 41374df2b780e0821ee3048e746d0f7a112df0a30c328cdc9a365fa533a9979a50b751201367ff567012f8665bd1233deae7f60b0518bd54fd265402f6c854ea +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = ec90a4927879ff63c94809239771bafd8dd571a3468893184fc2d2837c58e538efc1ebfec85cdac0f2eafd202e37a971c8d51f340c6cd2df1a0f7693aab2b2db