From eb809f905d378302e18c81f3b864de49e1bf0b81 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 17 Jun 2025 09:44:38 -0600 Subject: [PATCH] kernel-6.16.0-0.rc2.250617g9afe652958c3.25 * Tue Jun 17 2025 Fedora Kernel Team [6.16.0-0.rc2.9afe652958c3.25] - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 --- kernel.changelog | 7 +++++-- kernel.spec | 12 +++++++----- patch-6.16-redhat.patch | 26 +++----------------------- sources | 6 +++--- 6 files changed, 19 insertions(+), 37 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index af8140623..a51924a39 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 = 24 +RHEL_RELEASE = 25 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 3f1ed1259..cfca4656f 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/56deb4e0815529b1e1aecb94efd6b3c865e47643 - 56deb4e0815529b1e1aecb94efd6b3c865e47643 powerpc: Fix struct termio related ioctl macros - https://gitlab.com/cki-project/kernel-ark/-/commit/a66ceecaa34b5524a42617d289f3d2fe7b7702d5 a66ceecaa34b5524a42617d289f3d2fe7b7702d5 redhat: make ENABLE_WERROR also enable OBJTOOL_WERROR diff --git a/kernel.changelog b/kernel.changelog index 47e4d9cc7..58fb09f3d 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,6 +1,9 @@ -* Mon Jun 16 2025 Fedora Kernel Team [6.16.0-0.rc2.24] +* Tue Jun 17 2025 Fedora Kernel Team [6.16.0-0.rc2.9afe652958c3.25] - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) -- powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) +Resolves: + +* Tue Jun 17 2025 Fedora Kernel Team [6.16.0-0.rc2.9afe652958c3.24] +- Linux v6.16.0-0.rc2.9afe652958c3 Resolves: * Mon Jun 16 2025 Fedora Kernel Team [6.16.0-0.rc2.23] diff --git a/kernel.spec b/kernel.spec index 403124083..86db0af35 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.16.0 %define specversion 6.16.0 %define patchversion 6.16 -%define pkgrelease 0.rc2.24 +%define pkgrelease 0.rc2.250617g9afe652958c3.25 %define kversion 6 -%define tarfile_release 6.16-rc2 +%define tarfile_release 6.16-rc2-24-g9afe652958c3 # This is needed to do merge window version magic %define patchlevel 16 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.24%{?buildid}%{?dist} +%define specrelease 0.rc2.250617g9afe652958c3.25%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.16.0 @@ -4337,9 +4337,11 @@ fi\ # # %changelog -* Mon Jun 16 2025 Fedora Kernel Team [6.16.0-0.rc2.24] +* Tue Jun 17 2025 Fedora Kernel Team [6.16.0-0.rc2.9afe652958c3.25] - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) -- powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) + +* Tue Jun 17 2025 Fedora Kernel Team [6.16.0-0.rc2.9afe652958c3.24] +- Linux v6.16.0-0.rc2.9afe652958c3 * Mon Jun 16 2025 Fedora Kernel Team [6.16.0-0.rc2.23] - Linux v6.16.0-0.rc2 diff --git a/patch-6.16-redhat.patch b/patch-6.16-redhat.patch index 43db95113..33aefc7f6 100644 --- a/patch-6.16-redhat.patch +++ b/patch-6.16-redhat.patch @@ -5,7 +5,6 @@ Makefile | 48 +- arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 2 +- - arch/powerpc/include/uapi/asm/ioctls.h | 8 +- arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + @@ -76,7 +75,7 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 78 files changed, 2734 insertions(+), 211 deletions(-) + 77 files changed, 2730 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index f1f2c0874da9..bcbfd150b8a1 100644 @@ -299,25 +298,6 @@ index 55fc331af337..f5d5e59058a2 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -diff --git a/arch/powerpc/include/uapi/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h -index 2c145da3b774..b5211e413829 100644 ---- a/arch/powerpc/include/uapi/asm/ioctls.h -+++ b/arch/powerpc/include/uapi/asm/ioctls.h -@@ -23,10 +23,10 @@ - #define TCSETSW _IOW('t', 21, struct termios) - #define TCSETSF _IOW('t', 22, struct termios) - --#define TCGETA _IOR('t', 23, struct termio) --#define TCSETA _IOW('t', 24, struct termio) --#define TCSETAW _IOW('t', 25, struct termio) --#define TCSETAF _IOW('t', 28, struct termio) -+#define TCGETA 0x40147417 /* _IOR('t', 23, struct termio) */ -+#define TCSETA 0x80147418 /* _IOW('t', 24, struct termio) */ -+#define TCSETAW 0x80147419 /* _IOW('t', 25, struct termio) */ -+#define TCSETAF 0x8014741c /* _IOW('t', 28, struct termio) */ - - #define TCSBRK _IO('t', 29) - #define TCXONC _IO('t', 30) diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index b0d00032479d..afb9544fb007 100644 --- a/arch/s390/include/asm/ipl.h @@ -2427,7 +2407,7 @@ index bf3bbac4e02a..b9840b1a43fe 100644 LSM_HOOK(int, 0, perf_event_open, int type) LSM_HOOK(int, 0, perf_event_alloc, struct perf_event *event) diff --git a/include/linux/module.h b/include/linux/module.h -index 92e1420fccdf..78f3f89dbcf9 100644 +index 5faa1fb1f4b4..036ee89e331b 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -430,6 +430,7 @@ struct module { @@ -2438,7 +2418,7 @@ index 92e1420fccdf..78f3f89dbcf9 100644 struct kobject *holders_dir; /* Exported symbols */ -@@ -1024,4 +1025,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, +@@ -1019,4 +1020,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, #endif /* CONFIG_MODULES && CONFIG_KALLSYMS */ diff --git a/sources b/sources index e24afc98c..f1cacdee9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.16-rc2.tar.xz) = 2607192678e033e3972df1c4b0c9ff23932304e430e190cff6c5e3b6c66ef0f9bb55770378a012dee0deae0ecc2b84bf3132eb672fd4c67bf28e2e165cde968a -SHA512 (kernel-abi-stablelists-6.16.0.tar.xz) = 0cf5b9d1c3f2f9fc07a7c5ce549adac03ef597f8be2a4b3e885430f127decce4c58fc47db55ce63056c1d5829c0e4e4762a1eae966020a05e2269ca9db42bbc5 -SHA512 (kernel-kabi-dw-6.16.0.tar.xz) = 2d478f7931681ae73fddc2f41090f0d516a1c08c2968f80f39b2de1787f423477030c49accf2d845f3e0f7a6bc331db865005636613f6534450157e4987e8895 +SHA512 (linux-6.16-rc2-24-g9afe652958c3.tar.xz) = ee3fa0aa819b493c99ff3055f73fde7e3615c83d856beefd271d8ba88cb212995533488dc9463b77237738433e3cb89685544318da0808187229ed9783f3f8a5 +SHA512 (kernel-abi-stablelists-6.16.0.tar.xz) = b75b5810159958216e9b173f16eed526b2e9f2a217d5d9c10f3e8ce0034c8391c06c132f09f094ea8a3b997343b2ebdc30a23b88d949964687ba27151b67dd5a +SHA512 (kernel-kabi-dw-6.16.0.tar.xz) = e04dfbac450790ef846e9761f17e8ea19feb7709a6221f6877cde3838c122fd4be62b82763d097bdc9571819a2beaa9b49a8dfef8d6065fd1d89d16d1a111dd3