From 0eaaef437f6b94c34e2b06742ef8813016ff7684 Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Wed, 9 Apr 2025 16:49:08 -0400 Subject: [PATCH] kernel-6.15.0-0.rc1.20250409gita24588245776.17 * Wed Apr 09 2025 Fedora Kernel Team [6.15.0-0.rc1.a24588245776.17] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) Resolves: Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 +- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-automotive-debug-rhel.config | 1 - kernel-aarch64-automotive-rhel.config | 1 - kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-aarch64-rt-debug-rhel.config | 2 +- kernel-aarch64-rt-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-riscv64-debug-fedora.config | 2 +- kernel-riscv64-fedora.config | 2 +- kernel-riscv64-rt-debug-fedora.config | 2 +- kernel-riscv64-rt-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-x86_64-automotive-debug-rhel.config | 1 - kernel-x86_64-automotive-rhel.config | 1 - kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel-x86_64-rt-debug-rhel.config | 2 +- kernel-x86_64-rt-rhel.config | 2 +- kernel.changelog | 14 ++- kernel.spec | 99 ++++++--------------- patch-6.15-redhat.patch | 6 +- sources | 6 +- 28 files changed, 65 insertions(+), 106 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 19625044f..34a2a7385 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 = 15 +RHEL_RELEASE = 17 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index e8d8beeb9..db9a1368a 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -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/c547e5a508127331286b8daf9aceabcdeb4a88b9 + c547e5a508127331286b8daf9aceabcdeb4a88b9 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-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 468597156..514407aa0 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1167,7 +1167,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 52b411c8d..c43eed06f 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1167,7 +1167,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-aarch64-automotive-debug-rhel.config b/kernel-aarch64-automotive-debug-rhel.config index fa0d98833..9948e0b95 100644 --- a/kernel-aarch64-automotive-debug-rhel.config +++ b/kernel-aarch64-automotive-debug-rhel.config @@ -5034,7 +5034,6 @@ CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m CONFIG_NVME_HOST_AUTH=y # CONFIG_NVME_HWMON is not set -CONFIG_NVME_KEYRING=m # CONFIG_NVMEM_BCM_OCOTP is not set # CONFIG_NVMEM_IMX_IIM is not set # CONFIG_NVMEM_IMX_OCOTP_ELE is not set diff --git a/kernel-aarch64-automotive-rhel.config b/kernel-aarch64-automotive-rhel.config index 4ff4accc0..b64950045 100644 --- a/kernel-aarch64-automotive-rhel.config +++ b/kernel-aarch64-automotive-rhel.config @@ -5013,7 +5013,6 @@ CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m CONFIG_NVME_HOST_AUTH=y # CONFIG_NVME_HWMON is not set -CONFIG_NVME_KEYRING=m # CONFIG_NVMEM_BCM_OCOTP is not set # CONFIG_NVMEM_IMX_IIM is not set # CONFIG_NVMEM_IMX_OCOTP_ELE is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index ab1ad6b50..37bfa992d 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1165,7 +1165,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index c56ce6309..dcb94a0d7 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1165,7 +1165,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index c3bfcf7a0..a2e20395d 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1166,7 +1166,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index c1d841c96..fc9f09554 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1166,7 +1166,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index d0ea01ae7..63d091830 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -919,7 +919,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index b4aef0cfe..bae83e1e8 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -919,7 +919,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 284a0c13f..274645e26 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -1125,7 +1125,7 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC32=y # CONFIG_CRC_BENCHMARK is not set CONFIG_CRC_CCITT=y -CONFIG_CRC_ITU_T=y +CONFIG_CRC_ITU_T=m CONFIG_CRC_KUNIT_TEST=m CONFIG_CRC_OPTIMIZATIONS=y CONFIG_CRC_T10DIF_IMPL_ARCH=y diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index b9e36a5bc..60dcd635a 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -1124,7 +1124,7 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC32=y # CONFIG_CRC_BENCHMARK is not set CONFIG_CRC_CCITT=y -CONFIG_CRC_ITU_T=y +CONFIG_CRC_ITU_T=m CONFIG_CRC_KUNIT_TEST=m CONFIG_CRC_OPTIMIZATIONS=y CONFIG_CRC_T10DIF_IMPL_ARCH=y diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index 0ac93f451..0e065af05 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -1126,7 +1126,7 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC32=y # CONFIG_CRC_BENCHMARK is not set CONFIG_CRC_CCITT=y -CONFIG_CRC_ITU_T=y +CONFIG_CRC_ITU_T=m CONFIG_CRC_KUNIT_TEST=m CONFIG_CRC_OPTIMIZATIONS=y CONFIG_CRC_T10DIF_IMPL_ARCH=y diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index 6ec11c87c..102db4c3f 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -1125,7 +1125,7 @@ CONFIG_CRC32_SLICEBY8=y CONFIG_CRC32=y # CONFIG_CRC_BENCHMARK is not set CONFIG_CRC_CCITT=y -CONFIG_CRC_ITU_T=y +CONFIG_CRC_ITU_T=m CONFIG_CRC_KUNIT_TEST=m CONFIG_CRC_OPTIMIZATIONS=y CONFIG_CRC_T10DIF_IMPL_ARCH=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3237d3839..4b5ad71e8 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -918,7 +918,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index c29d7a6a8..1518b2f63 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -918,7 +918,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-x86_64-automotive-debug-rhel.config b/kernel-x86_64-automotive-debug-rhel.config index 84e4b67d8..784c2145d 100644 --- a/kernel-x86_64-automotive-debug-rhel.config +++ b/kernel-x86_64-automotive-debug-rhel.config @@ -4734,7 +4734,6 @@ CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m CONFIG_NVME_HOST_AUTH=y # CONFIG_NVME_HWMON is not set -CONFIG_NVME_KEYRING=m # CONFIG_NVMEM_IMX_OCOTP_ELE is not set # CONFIG_NVMEM_IMX_OCOTP is not set # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set diff --git a/kernel-x86_64-automotive-rhel.config b/kernel-x86_64-automotive-rhel.config index e2bf2edd5..e10a09a47 100644 --- a/kernel-x86_64-automotive-rhel.config +++ b/kernel-x86_64-automotive-rhel.config @@ -4714,7 +4714,6 @@ CONFIG_NVME_AUTH=m CONFIG_NVME_FC=m CONFIG_NVME_HOST_AUTH=y # CONFIG_NVME_HWMON is not set -CONFIG_NVME_KEYRING=m # CONFIG_NVMEM_IMX_OCOTP_ELE is not set # CONFIG_NVMEM_IMX_OCOTP is not set # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 1b1dac3c3..122adc8c7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -956,7 +956,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 50308150f..8140bcf7b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -956,7 +956,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 819746001..2934ff491 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -957,7 +957,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index ad4bdfe22..f4d1b3585 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -957,7 +957,7 @@ CONFIG_CRASH_DUMP=y CONFIG_CRASH_HOTPLUG=y CONFIG_CRASH_MAX_MEMORY_RANGES=8192 CONFIG_CRC16_KUNIT_TEST=m -CONFIG_CRC16=y +CONFIG_CRC16=m # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY1 is not set CONFIG_CRC32_IMPL_ARCH_PLUS_SLICEBY8=y diff --git a/kernel.changelog b/kernel.changelog index 65cc0e7b7..34032df9e 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,19 @@ -* Tue Apr 08 2025 Fedora Kernel Team [6.15.0-0.rc1.15] +* Wed Apr 09 2025 Fedora Kernel Team [6.15.0-0.rc1.a24588245776.17] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) Resolves: +* Wed Apr 09 2025 Fedora Kernel Team [6.15.0-0.rc1.a24588245776.16] +- Fix up CONFIG_CRC_ITU_T mismatch (Scott Weaver) +- Fix up CONFIG_CRC16 mismatch (Scott Weaver) +- Linux v6.15.0-0.rc1.a24588245776 +Resolves: + +* Wed Apr 09 2025 Fedora Kernel Team [6.15.0-0.rc1.15] +- redhat: remove kernel-ipaclones-internal package (Joe Lawrence) +- redhat/kernel.spec.template: add net packetdrill selftests (Hangbin Liu) +- redhat/kernel.spec.template: Build rtla with BPF sample collection (Tomas Glozar) +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) diff --git a/kernel.spec b/kernel.spec index 067ad44d4..c0320e110 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.15 +%define pkgrelease 0.rc1.20250409gita24588245776.17 %define kversion 6 -%define tarfile_release 6.15-rc1 +%define tarfile_release 6.15-rc1-60-ga24588245776 # 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.15%{?buildid}%{?dist} +%define specrelease 0.rc1.20250409gita24588245776.17%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -284,10 +284,6 @@ Summary: The Linux kernel # gcov support %define with_gcov %{?_with_gcov:1}%{?!_with_gcov:0} -# -# ipa_clone support -%define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1} - # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -301,8 +297,6 @@ Summary: The Linux kernel # Kernel headers are being split out into a separate package %define with_headers 0 %define with_cross_headers 0 -# no ipa_clone for now -%define with_ipaclones 0 # no stablelist %define with_kernel_abi_stablelists 0 %define with_arm64_64k 0 @@ -328,8 +322,6 @@ Summary: The Linux kernel %global clang_make_opts %{clang_make_opts} LLVM=1 %endif %global make_opts %{make_opts} %{clang_make_opts} -# clang does not support the -fdump-ipa-clones option -%global with_ipaclones 0 %endif # turn off debug kernel and kabichk for gcov builds @@ -347,16 +339,6 @@ Summary: The Linux kernel %define with_kabidwchk 0 %endif -# kpatch_kcflags are extra compiler flags applied to base kernel -# -fdump-ipa-clones is enabled only for base kernels on selected arches -%if %{with_ipaclones} -%ifarch x86_64 ppc64le -%define kpatch_kcflags -fdump-ipa-clones -%else -%define with_ipaclones 0 -%endif -%endif - %define make_target bzImage %define image_install_path boot @@ -395,7 +377,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %endif # if requested, only build debug kernel @@ -407,7 +388,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %endif # if requested, only build realtime kernel @@ -423,7 +403,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %define with_headers 0 %define with_efiuki 0 %define with_zfcpdump 0 @@ -468,7 +447,6 @@ Summary: The Linux kernel %define with_kabichk 0 %define with_kernel_abi_stablelists 0 %define with_kabidw_base 0 -%define with_ipaclones 0 %endif @@ -755,6 +733,9 @@ BuildRequires: libcap-devel libcap-ng-devel BuildRequires: python3-docutils BuildRequires: libtraceevent-devel BuildRequires: libtracefs-devel +BuildRequires: libbpf-devel +BuildRequires: bpftool +BuildRequires: clang %ifnarch s390x BuildRequires: pciutils-devel @@ -1311,6 +1292,7 @@ Epoch: %{gemini} Summary: Real-Time Linux Analysis tools Requires: libtraceevent Requires: libtracefs +Requires: libbpf %ifarch %{cpupowerarchs} Requires: %{package_name}-tools-libs = %{version}-%{release} %endif @@ -1442,18 +1424,6 @@ Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\ This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\ %{nil} -# -# kernel--ipaclones-internal package -# -%define kernel_ipaclones_package() \ -%package %{?1:%{1}-}ipaclones-internal\ -Summary: *.ipa-clones files generated by -fdump-ipa-clones for kernel%{?1:-%{1}}\ -Group: System Environment/Kernel\ -AutoReqProv: no\ -%description %{?1:%{1}-}ipaclones-internal\ -This package provides *.ipa-clones files.\ -%{nil} - # # This macro creates a kernel--modules-internal package. # %%kernel_modules_internal_package @@ -1834,10 +1804,6 @@ Prebuilt 64k unified kernel image for virtual machines. Prebuilt 64k unified kernel image addons for virtual machines. %endif -%if %{with_ipaclones} -%kernel_ipaclones_package -%endif - %define log_msg() \ { set +x; } 2>/dev/null \ _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec | grep log_msg | cut -d":" -f1) \ @@ -2177,12 +2143,6 @@ InitBuildVars() { %{log_msg "InitBuildVars: USING ARCH=$Arch"} KCFLAGS="%{?kcflags}" - - # add kpatch flags for base kernel - %{log_msg "InitBuildVars: Configure KCFLAGS"} - if [ "$Variant" == "" ]; then - KCFLAGS="$KCFLAGS %{?kpatch_kcflags}" - fi } #Build bootstrap bpftool @@ -2962,18 +2922,6 @@ BuildKernel() { fi %endif -%if %{with_ipaclones} - %{log_msg "install IPA clones"} - MAXPROCS=$(echo %{?_smp_mflags} | sed -n 's/-j\s*\([0-9]\+\)/\1/p') - if [ -z "$MAXPROCS" ]; then - MAXPROCS=1 - fi - if [ "$Variant" == "" ]; then - mkdir -p $RPM_BUILD_ROOT/$DevelDir-ipaclones - find . -name '*.ipa-clones' | xargs -i{} -r -n 1 -P $MAXPROCS install -m 644 -D "{}" "$RPM_BUILD_ROOT/$DevelDir-ipaclones/{}" - fi -%endif - %if %{with_gcov} popd %endif @@ -3198,7 +3146,7 @@ pushd tools/testing/selftests %endif %{log_msg "main selftests compile"} -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf cgroup mm net net/forwarding net/mptcp net/netfilter tc-testing memfd drivers/net/bonding iommu cachestat" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install +%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf cgroup mm net net/forwarding net/mptcp net/netfilter net/packetdrill tc-testing memfd drivers/net/bonding iommu cachestat" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install %ifarch %{klptestarches} # kernel livepatching selftest test_modules will build against @@ -3569,6 +3517,12 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/netfilte find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/net/netfilter/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/net/netfilter/{} \; popd +# install net/packetdrill selftests +pushd tools/testing/selftests/net/packetdrill +find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/packetdrill/{} \; +find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/net/packetdrill/{} \; +find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/net/packetdrill/{} \; +popd # install memfd selftests pushd tools/testing/selftests/memfd @@ -4223,27 +4177,24 @@ fi\ %kernel_variant_files %{_use_vdso} %{with_arm64_16k_base} 16k %kernel_variant_files %{_use_vdso} %{with_arm64_64k_base} 64k -%define kernel_variant_ipaclones(k:) \ -%if %{1}\ -%if %{with_ipaclones}\ -%{expand:%%files %{?2:%{2}-}ipaclones-internal}\ -%defattr(-,root,root)\ -%defverify(not mtime)\ -/usr/src/kernels/%{KVERREL}%{?2:+%{2}}-ipaclones\ -%endif\ -%endif\ -%{nil} - -%kernel_variant_ipaclones %{with_up_base} - # plz don't put in a version string unless you're going to tag # and build. # # %changelog -* Tue Apr 08 2025 Fedora Kernel Team [6.15.0-0.rc1.15] +* Wed Apr 09 2025 Fedora Kernel Team [6.15.0-0.rc1.a24588245776.17] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) +* Wed Apr 09 2025 Fedora Kernel Team [6.15.0-0.rc1.a24588245776.16] +- Fix up CONFIG_CRC_ITU_T mismatch (Scott Weaver) +- Fix up CONFIG_CRC16 mismatch (Scott Weaver) +- Linux v6.15.0-0.rc1.a24588245776 + +* Wed Apr 09 2025 Fedora Kernel Team [6.15.0-0.rc1.15] +- redhat: remove kernel-ipaclones-internal package (Joe Lawrence) +- redhat/kernel.spec.template: add net packetdrill selftests (Hangbin Liu) +- redhat/kernel.spec.template: Build rtla with BPF sample collection (Tomas Glozar) + * 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) diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index c3b319e42..65e00bf69 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -192,7 +192,7 @@ index 000000000000..85771d74c34f + +endmenu diff --git a/Makefile b/Makefile -index 38689a0c3605..10e552fbebf3 100644 +index f42418556507..12f0de36fd73 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -232,7 +232,7 @@ index 38689a0c3605..10e552fbebf3 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1325,7 +1348,13 @@ define filechk_version.h +@@ -1328,7 +1351,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -247,7 +247,7 @@ index 38689a0c3605..10e552fbebf3 100644 endef $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) -@@ -1927,6 +1956,23 @@ endif +@@ -1930,6 +1959,23 @@ endif ifdef CONFIG_MODULES diff --git a/sources b/sources index fa5a49ac0..158c82c5e 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) = 3f02081d7c564109216c367574a695076b5d3f86f7708f38ef6830d5bbba5d413cf0e474403ed323cb459d434682df5962423d9748914e690857ad2854077e00 -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 6e0fc9b7baa60f1486337eaf66c806ccc23faf743b67272b1a7b857396705412fac69bede03246c031edd1ce23ddb333d11aa941a11e06c2145f82e534767ef7 +SHA512 (linux-6.15-rc1-60-ga24588245776.tar.xz) = 1aa58ca6c4d1561f94afd71c44ae77bd07aa4e03a281aaf4b499d5b30444ebbfbdac0cbe6e54a21e4a887f4313e8e21350ce8440e603a156086c0f54eedcb2d8 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 625677c75052c01289775f9cdbbead3d56eecf769aa9338d094ad339a9f2b8533358e180e301bea25ae9fba218e6ccd329876a7695b0bcdf6b94d11a8eb87f77 +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 00560d3bf336ce6c60b05d5231d48fe24d5e0831d290fb94174054604f881d4eb8689a1f162be8cc866681f04e4cb0628ab63c2c3a9ea7496bcbd9217045c7bb