kernel-6.15.0-0.rc6.250515g088d13246a46.54
* Thu May 15 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc6.088d13246a46.54] - Revert "kbuild: Require pahole <v1.28 or >v1.29 with GENDWARFKSYMS on X86" (Justin M. Forbes) - Revert CONFIG_GENKSYMS for x86 (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
f5f4dc796c
commit
99104fb746
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 51
|
||||
RHEL_RELEASE = 54
|
||||
|
||||
#
|
||||
# RHEL_REBASE_NUM
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/69785a550e8aa1fa8f03e904e64e602a0ba719d2
|
||||
69785a550e8aa1fa8f03e904e64e602a0ba719d2 Revert "kbuild: Require pahole <v1.28 or >v1.29 with GENDWARFKSYMS on X86"
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/99c8b56381c2f05815c77e6e41380b3d23559ea0
|
||||
99c8b56381c2f05815c77e6e41380b3d23559ea0 mei: vsc: Fix fortify-panic caused by invalid counted_by() use
|
||||
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
* Thu May 15 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc6.088d13246a46.54]
|
||||
- Revert "kbuild: Require pahole <v1.28 or >v1.29 with GENDWARFKSYMS on X86" (Justin M. Forbes)
|
||||
- Revert CONFIG_GENKSYMS for x86 (Justin M. Forbes)
|
||||
Resolves:
|
||||
|
||||
* Thu May 15 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc6.088d13246a46.53]
|
||||
- Flip GENKSYMS for RHEL (Justin M. Forbes)
|
||||
- Linux v6.15.0-0.rc6.088d13246a46
|
||||
Resolves:
|
||||
|
||||
* Thu May 15 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc6.9f35e33144ae.52]
|
||||
- Move MITIGATION_ITS to the x86 directory (Justin M. Forbes)
|
||||
- Set MITIGATION_ITS for Fedora (Justin M. Forbes)
|
||||
- Fedora: arm: Updates for QCom devices (Souradeep Chowdhury)
|
||||
Resolves:
|
||||
|
||||
* Wed May 14 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc6.9f35e33144ae.51]
|
||||
- redhat/configs: Explicitly disable CONFIG_VIRTIO_MEM on powerpc in RHEL (Thomas Huth)
|
||||
- redhat/configs: Consolidate the CONFIG_AP_DEBUG config switch (Thomas Huth)
|
||||
|
||||
16
kernel.spec
16
kernel.spec
@ -162,13 +162,13 @@ Summary: The Linux kernel
|
||||
%define specrpmversion 6.15.0
|
||||
%define specversion 6.15.0
|
||||
%define patchversion 6.15
|
||||
%define pkgrelease 0.rc6.250514g9f35e33144ae.51
|
||||
%define pkgrelease 0.rc6.250515g088d13246a46.54
|
||||
%define kversion 6
|
||||
%define tarfile_release 6.15-rc6-52-g9f35e33144ae
|
||||
%define tarfile_release 6.15-rc6-105-g088d13246a46
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 15
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc6.250514g9f35e33144ae.51%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc6.250515g088d13246a46.54%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.15.0
|
||||
|
||||
@ -4259,7 +4259,15 @@ fi\
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed May 14 2025 Justin M. Forbes <jforbes@fedoraproject.org> [6.15.0-0.rc6.250514g9f35e33144ae.51]
|
||||
* Thu May 15 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc6.088d13246a46.54]
|
||||
- Revert "kbuild: Require pahole <v1.28 or >v1.29 with GENDWARFKSYMS on X86" (Justin M. Forbes)
|
||||
- Revert CONFIG_GENKSYMS for x86 (Justin M. Forbes)
|
||||
|
||||
* Thu May 15 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc6.088d13246a46.53]
|
||||
- Flip GENKSYMS for RHEL (Justin M. Forbes)
|
||||
- Linux v6.15.0-0.rc6.088d13246a46
|
||||
|
||||
* Thu May 15 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.15.0-0.rc6.9f35e33144ae.52]
|
||||
- Move MITIGATION_ITS to the x86 directory (Justin M. Forbes)
|
||||
- Set MITIGATION_ITS for Fedora (Justin M. Forbes)
|
||||
- Fedora: arm: Updates for QCom devices (Souradeep Chowdhury)
|
||||
|
||||
@ -63,6 +63,7 @@
|
||||
kernel/Makefile | 1 +
|
||||
kernel/bpf/core.c | 5 +
|
||||
kernel/bpf/syscall.c | 23 +
|
||||
kernel/module/Kconfig | 5 -
|
||||
kernel/module/main.c | 13 +
|
||||
kernel/module/signing.c | 9 +-
|
||||
kernel/panic.c | 12 +
|
||||
@ -75,7 +76,7 @@
|
||||
security/integrity/platform_certs/load_uefi.c | 6 +-
|
||||
security/lockdown/Kconfig | 13 +
|
||||
security/lockdown/lockdown.c | 11 +
|
||||
77 files changed, 2725 insertions(+), 208 deletions(-)
|
||||
78 files changed, 2725 insertions(+), 213 deletions(-)
|
||||
|
||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
||||
index 8f75ec177399..0c4bc4a2203d 100644
|
||||
@ -190,7 +191,7 @@ index 000000000000..85771d74c34f
|
||||
+
|
||||
+endmenu
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 64c514f4bc19..815f96b6d348 100644
|
||||
index 0eb9e6c49b32..1488d275090e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||
@ -230,7 +231,7 @@ index 64c514f4bc19..815f96b6d348 100644
|
||||
ifdef mixed-build
|
||||
# ===========================================================================
|
||||
# We're called with mixed targets (*config and build targets).
|
||||
@@ -1323,7 +1346,13 @@ define filechk_version.h
|
||||
@@ -1322,7 +1345,13 @@ define filechk_version.h
|
||||
((c) > 255 ? 255 : (c)))'; \
|
||||
echo \#define LINUX_VERSION_MAJOR $(VERSION); \
|
||||
echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
|
||||
@ -245,7 +246,7 @@ index 64c514f4bc19..815f96b6d348 100644
|
||||
endef
|
||||
|
||||
$(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0)
|
||||
@@ -1925,6 +1954,23 @@ endif
|
||||
@@ -1924,6 +1953,23 @@ endif
|
||||
|
||||
ifdef CONFIG_MODULES
|
||||
|
||||
@ -3260,6 +3261,22 @@ index 64c3393e8270..827ab64621bb 100644
|
||||
*(int *)table->data = unpriv_enable;
|
||||
}
|
||||
|
||||
diff --git a/kernel/module/Kconfig b/kernel/module/Kconfig
|
||||
index 39278737bb68..d7762ef5949a 100644
|
||||
--- a/kernel/module/Kconfig
|
||||
+++ b/kernel/module/Kconfig
|
||||
@@ -192,11 +192,6 @@ config GENDWARFKSYMS
|
||||
depends on !DEBUG_INFO_REDUCED && !DEBUG_INFO_SPLIT
|
||||
# Requires ELF object files.
|
||||
depends on !LTO
|
||||
- # To avoid conflicts with the discarded __gendwarfksyms_ptr symbols on
|
||||
- # X86, requires pahole before commit 47dcb534e253 ("btf_encoder: Stop
|
||||
- # indexing symbols for VARs") or after commit 9810758003ce ("btf_encoder:
|
||||
- # Verify 0 address DWARF variables are in ELF section").
|
||||
- depends on !X86 || !DEBUG_INFO_BTF || PAHOLE_VERSION < 128 || PAHOLE_VERSION > 129
|
||||
help
|
||||
Calculate symbol versions from DWARF debugging information using
|
||||
gendwarfksyms. Requires DEBUG_INFO to be enabled.
|
||||
diff --git a/kernel/module/main.c b/kernel/module/main.c
|
||||
index a2859dc3eea6..dda7d7026bbb 100644
|
||||
--- a/kernel/module/main.c
|
||||
|
||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-6.15-rc6-52-g9f35e33144ae.tar.xz) = 5c130433de0d82dc7431e8b600273264b8e8c4566d3ca1054eca031234418b9f0ed1f812945f7faf13707170ee26ad9829c70453de42fac2808feac00333058e
|
||||
SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = b23241e56899599652a15f83245aa3ef6890bd0aa21a73deed5b1acdabda7cf78232c38c206ae484b2378b56613c2990a15bac3442274ea60c99ec422e46b830
|
||||
SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = e498cc8eeb97750bea9467bd3bf7f54a5bfe56c4ffceb1a3489fb5ac0024b9d003b94792ceaa113c9ee535897036fbac904d17669d5e178f73d06b7a624aad7e
|
||||
SHA512 (linux-6.15-rc6-105-g088d13246a46.tar.xz) = 31c596bfaface6f26180188b1e4134befc11f8bf3d7597de14277029ce027640af4909ed6797f8541b3c114262b9bde8c2158130a665dee1feda7be15e39fc11
|
||||
SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = c22fab7a05a05a3f2baeb2bbdade670c3d1edcf7efd12195efc36c7e1c41c532925282aaaa5bcf743c37e6b0b57fda3bbefff444e30fba36df945da07e1cdd4d
|
||||
SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = d554401b69e8309121fd322bd8a71128418860ea6fa46a2bf9b5497b3761d8a8d8ae16d12095266c84dc0c56479a43377c29e7839eb80f36d4b36458a14fe28a
|
||||
|
||||
Loading…
Reference in New Issue
Block a user