From 8fb274d385c499bb29475712b43ffccfa0041f22 Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Tue, 8 Apr 2025 19:00:22 -0400 Subject: [PATCH] kernel-6.15.0-0.rc1.15 * Tue Apr 08 2025 Fedora Kernel Team [6.15.0-0.rc1.15] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) Resolves: Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 +-- kernel-aarch64-16k-debug-fedora.config | 1 - kernel-aarch64-16k-fedora.config | 1 - kernel-aarch64-64k-debug-rhel.config | 1 - kernel-aarch64-64k-rhel.config | 1 - kernel-aarch64-automotive-debug-rhel.config | 3 +- kernel-aarch64-automotive-rhel.config | 3 +- kernel-aarch64-debug-fedora.config | 1 - kernel-aarch64-debug-rhel.config | 1 - kernel-aarch64-fedora.config | 1 - kernel-aarch64-rhel.config | 1 - kernel-aarch64-rt-debug-fedora.config | 1 - kernel-aarch64-rt-debug-rhel.config | 1 - kernel-aarch64-rt-fedora.config | 1 - kernel-aarch64-rt-rhel.config | 1 - kernel-ppc64le-debug-fedora.config | 1 - kernel-ppc64le-debug-rhel.config | 1 - kernel-ppc64le-fedora.config | 1 - kernel-ppc64le-rhel.config | 1 - kernel-riscv64-debug-fedora.config | 1 - kernel-riscv64-fedora.config | 1 - kernel-riscv64-rt-debug-fedora.config | 1 - kernel-riscv64-rt-fedora.config | 1 - kernel-s390x-debug-fedora.config | 1 - kernel-s390x-debug-rhel.config | 1 - kernel-s390x-fedora.config | 1 - kernel-s390x-rhel.config | 1 - kernel-s390x-zfcpdump-rhel.config | 1 - kernel-x86_64-automotive-debug-rhel.config | 3 +- kernel-x86_64-automotive-rhel.config | 3 +- kernel-x86_64-debug-fedora.config | 1 - kernel-x86_64-debug-rhel.config | 1 - kernel-x86_64-fedora.config | 1 - kernel-x86_64-rhel.config | 1 - kernel-x86_64-rt-debug-fedora.config | 1 - kernel-x86_64-rt-debug-rhel.config | 1 - kernel-x86_64-rt-fedora.config | 1 - kernel-x86_64-rt-rhel.config | 1 - kernel.changelog | 8 ++++- kernel.spec | 35 +++++++++++++++------ sources | 4 +-- uki_addons.json | 3 ++ 43 files changed, 45 insertions(+), 56 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 35038625f..19625044f 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 = 14 +RHEL_RELEASE = 15 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index d359bdfc5..e8d8beeb9 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/0e60a58f135f00b750ade5862475756b915ab81b - 0e60a58f135f00b750ade5862475756b915ab81b apply -Wno-error=unterminated-string-initialization temporarily +https://gitlab.com/cki-project/kernel-ark/-/commit/5896d9a8eafb050f6a6b26843ccd13105a6fde15 + 5896d9a8eafb050f6a6b26843ccd13105a6fde15 apply -Wno-error=unterminated-string-initialization temporarily https://gitlab.com/cki-project/kernel-ark/-/commit/99c8b56381c2f05815c77e6e41380b3d23559ea0 99c8b56381c2f05815c77e6e41380b3d23559ea0 mei: vsc: Fix fortify-panic caused by invalid counted_by() use diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index d0a473279..beb274f3c 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -9120,7 +9120,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index f77618079..59c2b7593 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -9089,7 +9089,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 2af919c14..468597156 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -7324,7 +7324,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 62a29e6f9..52b411c8d 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -7298,7 +7298,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-automotive-debug-rhel.config b/kernel-aarch64-automotive-debug-rhel.config index f138357b3..fa0d98833 100644 --- a/kernel-aarch64-automotive-debug-rhel.config +++ b/kernel-aarch64-automotive-debug-rhel.config @@ -773,7 +773,7 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_BOOT_PRINTK_DELAY=y @@ -7957,7 +7957,6 @@ CONFIG_TELCLOCK=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-automotive-rhel.config b/kernel-aarch64-automotive-rhel.config index 7c8b3f93d..4ff4accc0 100644 --- a/kernel-aarch64-automotive-rhel.config +++ b/kernel-aarch64-automotive-rhel.config @@ -773,7 +773,7 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_BOOT_PRINTK_DELAY=y @@ -7931,7 +7931,6 @@ CONFIG_TELCLOCK=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a706e9da5..0b15a5c6d 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -9119,7 +9119,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 63dc9737d..ab1ad6b50 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -7321,7 +7321,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 744d50367..2ee35d282 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -9088,7 +9088,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index a820d6c0a..c56ce6309 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -7295,7 +7295,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 095be16ea..b93c92726 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -9129,7 +9129,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 894c07e51..c3bfcf7a0 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -7366,7 +7366,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 786817836..10e1d2de0 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -9098,7 +9098,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 8965dca57..c1d841c96 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -7340,7 +7340,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index b4b7d1368..aa62fe12a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -7426,7 +7426,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 04aea54a1..d0ea01ae7 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -6746,7 +6746,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 52904a48a..ef9104444 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -7394,7 +7394,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index e3977d82f..b4aef0cfe 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -6722,7 +6722,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 53cdb31ea..284a0c13f 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -7516,7 +7516,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index 96fc4ffff..b9e36a5bc 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -7484,7 +7484,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index 5462e0929..0ac93f451 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -7526,7 +7526,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index ff834230f..6ec11c87c 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -7494,7 +7494,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4aed94b57..2bd0e250d 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -7364,7 +7364,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 9246d6599..3237d3839 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -6717,7 +6717,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index d8512e1c1..2acec82a9 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -7332,7 +7332,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 6da9e51ba..c29d7a6a8 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -6693,7 +6693,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 3ac0962bf..a6371ced8 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6714,7 +6714,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-automotive-debug-rhel.config b/kernel-x86_64-automotive-debug-rhel.config index ff50dcba8..84e4b67d8 100644 --- a/kernel-x86_64-automotive-debug-rhel.config +++ b/kernel-x86_64-automotive-debug-rhel.config @@ -567,7 +567,7 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y CONFIG_BOOTTIME_TRACING=y @@ -7371,7 +7371,6 @@ CONFIG_TELCLOCK=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-automotive-rhel.config b/kernel-x86_64-automotive-rhel.config index 10d8f8651..e2bf2edd5 100644 --- a/kernel-x86_64-automotive-rhel.config +++ b/kernel-x86_64-automotive-rhel.config @@ -567,7 +567,7 @@ CONFIG_BONDING=m # CONFIG_BOOT_CONFIG_FORCE is not set CONFIG_BOOT_CONFIG=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y CONFIG_BOOTTIME_TRACING=y @@ -7346,7 +7346,6 @@ CONFIG_TELCLOCK=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 3aad25311..f3f9a3e5a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7977,7 +7977,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b76ae0c5c..1b1dac3c3 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -7127,7 +7127,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 5c38037f9..304d99cdd 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7946,7 +7946,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 87595fccb..50308150f 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -7102,7 +7102,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index f6eb44fea..a83937f62 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -7987,7 +7987,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 511f658b3..819746001 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -7172,7 +7172,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index 608fa5127..69e3a26b0 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -7956,7 +7956,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 0ad35deae..ad4bdfe22 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -7147,7 +7147,6 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set -# CONFIG_TEST_BLACKHOLE_DEV is not set CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set CONFIG_TEST_CPUMASK=m diff --git a/kernel.changelog b/kernel.changelog index a8536ea4e..65cc0e7b7 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,13 @@ -* Mon Apr 07 2025 Fedora Kernel Team [6.15.0-0.rc1.14] +* Tue Apr 08 2025 Fedora Kernel Team [6.15.0-0.rc1.15] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) Resolves: +* Tue Apr 08 2025 Fedora Kernel Team [6.15.0-0.rc1.14] +- redhat/configs: automotive: Enable CONFIG_BOOTPARAM_HUNG_TASK_PANIC config (Dorinda Bassey) +- samples/bpf: fix build (Gregory Bell) +- redhat: create 'systemd-volatile-overlay' addon for UKI (Emanuele Giuseppe Esposito) +Resolves: + * Mon Apr 07 2025 Fedora Kernel Team [6.15.0-0.rc1.13] - fedora: arm64: move some TI drivers to modular (Peter Robinson) - fedora: minor cleanups for 6.14 (Peter Robinson) diff --git a/kernel.spec b/kernel.spec index 48fa02090..067ad44d4 100644 --- a/kernel.spec +++ b/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.rc1.14 +%define pkgrelease 0.rc1.15 %define kversion 6 %define tarfile_release 6.15-rc1 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.14%{?buildid}%{?dist} +%define specrelease 0.rc1.15%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -2185,6 +2185,13 @@ InitBuildVars() { fi } +#Build bootstrap bpftool +BuildBpftool(){ + export BPFBOOTSTRAP_CFLAGS=$(echo "%{__global_compiler_flags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") + export BPFBOOTSTRAP_LDFLAGS=$(echo "%{__global_ldflags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") + CFLAGS="" LDFLAGS="" make EXTRA_CFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_CXXFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap +} + BuildKernel() { %{log_msg "BuildKernel for $4"} MakeTarget=$1 @@ -2912,10 +2919,7 @@ BuildKernel() { if [ "$Variant" != "zfcpdump" ]; then %{log_msg "Build the bootstrap bpftool to generate vmlinux.h"} # Build the bootstrap bpftool to generate vmlinux.h - export BPFBOOTSTRAP_CFLAGS=$(echo "%{__global_compiler_flags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") - export BPFBOOTSTRAP_LDFLAGS=$(echo "%{__global_ldflags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") - CFLAGS="" LDFLAGS="" make EXTRA_CFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_CXXFLAGS="${BPFBOOTSTRAP_CFLAGS}" EXTRA_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap - + BuildBpftool tools/bpf/bpftool/bootstrap/bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h fi %endif @@ -3152,7 +3156,10 @@ pushd tools/tracing/rtla popd %endif -if [ -f $DevelDir/vmlinux.h ]; then +#set RPM_VMLINUX_H +if [ -f $RPM_BUILD_ROOT/$DevelDir/vmlinux.h ]; then + RPM_VMLINUX_H=$RPM_BUILD_ROOT/$DevelDir/vmlinux.h +elif [ -f $DevelDir/vmlinux.h ]; then RPM_VMLINUX_H=$DevelDir/vmlinux.h fi echo "${RPM_VMLINUX_H}" > ../vmlinux_h_path @@ -3173,8 +3180,13 @@ if [ ! -f include/generated/autoconf.h ]; then %{make} %{?_smp_mflags} modules_prepare fi +# Build BPFtool for samples/bpf +if [ ! -f tools/bpf/bpftool/bootstrap/bpftool ]; then + BuildBpftool +fi + %{log_msg "build samples/bpf"} -%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true +%{make} %{?_smp_mflags} ARCH=$Arch BPFTOOL=$(pwd)/tools/bpf/bpftool/bootstrap/bpftool V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true pushd tools/testing/selftests # We need to install here because we need to call make with ARCH set which @@ -4229,9 +4241,14 @@ fi\ # # %changelog -* Mon Apr 07 2025 Fedora Kernel Team [6.15.0-0.rc1.14] +* Tue Apr 08 2025 Fedora Kernel Team [6.15.0-0.rc1.15] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) +* Tue Apr 08 2025 Fedora Kernel Team [6.15.0-0.rc1.14] +- redhat/configs: automotive: Enable CONFIG_BOOTPARAM_HUNG_TASK_PANIC config (Dorinda Bassey) +- samples/bpf: fix build (Gregory Bell) +- redhat: create 'systemd-volatile-overlay' addon for UKI (Emanuele Giuseppe Esposito) + * Mon Apr 07 2025 Fedora Kernel Team [6.15.0-0.rc1.13] - fedora: arm64: move some TI drivers to modular (Peter Robinson) - fedora: minor cleanups for 6.14 (Peter Robinson) diff --git a/sources b/sources index e5620f6c7..fa5a49ac0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.15-rc1.tar.xz) = eb8f6e0e51e452ebc75abec41d70dce5b7ec76c6cf2cd8385dd085e719246c4dc04437332087a46b10b24c3c00a47ab66f0fcd6306231661b528411812c1f666 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = b363c9537e9801a1369551d09f3a1378cad41bf3fa0421b4c0c61fe9bb97577bd19e96ca53d653df9e05a46a1afe314b371155d77cc2e96685ab51c7869cd2f2 -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = c972e217599d1233f98f8aa7602d1ca3a27f586de52e300fe877585900777e49bdf639af671968a53029c6bf229aa0c066d64afdaada548e104e1061e9f6a84b +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 3f02081d7c564109216c367574a695076b5d3f86f7708f38ef6830d5bbba5d413cf0e474403ed323cb459d434682df5962423d9748914e690857ad2854077e00 +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 6e0fc9b7baa60f1486337eaf66c806ccc23faf743b67272b1a7b857396705412fac69bede03246c031edd1ce23ddb333d11aa941a11e06c2145f82e534767ef7 diff --git a/uki_addons.json b/uki_addons.json index accaf3901..4e579b167 100644 --- a/uki_addons.json +++ b/uki_addons.json @@ -23,6 +23,9 @@ ], "debug.addon": [ "debug" + ], + "systemd-volatile-overlay.addon": [ + "systemd.volatile=overlay" ] }, "virt": {