From f243944cb68968d668a3123909459fbe9dcd613c Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 4 Feb 2024 12:52:32 -0600 Subject: [PATCH] kernel-6.8.0-0.rc3.26 * Sun Feb 04 2024 Fedora Kernel Team [6.8.0-0.rc3.26] - tools/rv: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) - tools/rtla: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 6 ++ kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-aarch64-rt-debug-rhel.config | 2 +- kernel-aarch64-rt-rhel.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-fedora.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 | 24 ++++++- kernel.spec | 37 +++++++--- patch-6.8-redhat.patch | 96 +++++++++++++++++++------- sources | 6 +- 31 files changed, 156 insertions(+), 65 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 9e42da42f..5ec3fb3a4 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 = 22 +RHEL_RELEASE = 26 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index f9f81da03..a440c6250 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/bb76c84983429417ca7d93f7fc4b7d1be15f1f6a + bb76c84983429417ca7d93f7fc4b7d1be15f1f6a tools/rv: Fix Makefile compiler options for clang + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/2dad981c913df83ff1a23e86fe2360f9ab82fb19 + 2dad981c913df83ff1a23e86fe2360f9ab82fb19 tools/rtla: Fix Makefile compiler options for clang + "https://gitlab.com/cki-project/kernel-ark/-/commit"/00b18a7e395433017c0eabdd14a7c3db2c6d4d9a 00b18a7e395433017c0eabdd14a7c3db2c6d4d9a Fix up manual merge error in security.h diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 5fb771a69..43c05b8c4 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -9933,7 +9933,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 372fadd94..0cb7e5090 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -9904,7 +9904,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 043618fef..8b875c591 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -8021,7 +8021,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 2f7926c26..e354833d0 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -7996,7 +7996,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 715cc297a..0e65602ec 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -9933,7 +9933,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index dcbee0398..ec63a0cd5 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -8017,7 +8017,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 6eb293487..ee5ab131e 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -9904,7 +9904,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 78a28efbf..4a8e8d61d 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -7992,7 +7992,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 8542f1e8a..6c84caef1 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -8072,7 +8072,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index c6ad0dafb..01e50ad2a 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -8047,7 +8047,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set CONFIG_XGENE_PMU=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index d45b395d5..8bd119355 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -8238,7 +8238,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_XILINX_AXI_EMAC is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 12e82e702..9365d8400 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -7487,7 +7487,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index b0a039e05..569b0c345 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -8207,7 +8207,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_XILINX_AXI_EMAC is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index c11031f64..a081bc97d 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -7464,7 +7464,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0dddcb2ee..92fe6fdba 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -8175,7 +8175,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_XILINX_AXI_EMAC is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 2edc1eef6..84327b3b1 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -7469,7 +7469,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index be6449d9e..078840335 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -8144,7 +8144,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_XILINX_AXI_EMAC is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 53035704a..8af81be84 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -7446,7 +7446,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 652583cd6..612350601 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -7469,7 +7469,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index ebba013a8..0cadd2853 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -8820,7 +8820,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XIAOMI_WMI is not set # CONFIG_XIL_AXIS_FIFO is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0e0d7da50..ff85ff2c2 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -7823,7 +7823,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set # CONFIG_XIAOMI_WMI is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index c82146cb4..9c2235000 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -8790,7 +8790,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y CONFIG_XFS_RT=y CONFIG_XFS_SUPPORT_ASCII_CI=y -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XIAOMI_WMI is not set # CONFIG_XIL_AXIS_FIFO is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index cd28187f5..a787b32d8 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -7799,7 +7799,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set # CONFIG_XIAOMI_WMI is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 7c2936ba8..f9797a002 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -7879,7 +7879,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set CONFIG_XFS_WARN=y # CONFIG_XGENE_DMA is not set # CONFIG_XIAOMI_WMI is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index d2065f9bb..47421b06f 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -7855,7 +7855,7 @@ CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set # CONFIG_XFS_SUPPORT_ASCII_CI is not set -CONFIG_XFS_SUPPORT_V4=y +# CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set # CONFIG_XGENE_DMA is not set # CONFIG_XIAOMI_WMI is not set diff --git a/kernel.changelog b/kernel.changelog index 81e770a1a..7140d5b19 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,9 +1,31 @@ -* Thu Feb 01 2024 Fedora Kernel Team [6.8.0-0.rc2.6764c317b6bb.22] +* Sun Feb 04 2024 Fedora Kernel Team [6.8.0-0.rc3.26] +- tools/rv: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) +- tools/rtla: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) +Resolves: + +* Sun Feb 04 2024 Fedora Kernel Team [6.8.0-0.rc3.25] - Remove defines forcing tools on, they override cmdline (Justin M. Forbes) - Remove separate license tag for libperf (Justin M. Forbes) - Don't use upstream bpftool version for Fedora package (Justin M. Forbes) - Don't ship libperf.a in libperf-devel (Justin M. Forbes) - add libperf packages and enable perf, libperf, tools and bpftool packages (Thorsten Leemhuis) +- Linux v6.8.0-0.rc3 +Resolves: + +* Sun Feb 04 2024 Fedora Kernel Team [6.8.0-0.rc2.3f24fcdacd40.24] +- Linux v6.8.0-0.rc2.3f24fcdacd40 +Resolves: + +* Sat Feb 03 2024 Fedora Kernel Team [6.8.0-0.rc2.56897d51886f.23] +- Add scaffolding to build the kernel-headers package for Fedora (Justin M. Forbes) +- redhat/spec: use distro CFLAGS when building bootstrap bpftool (Artem Savkov) +- spec: use just-built bpftool for vmlinux.h generation (Yauheni Kaliuta) [2120968] +- gitlab-ci: enable native tools for Rawhide CI (Michael Hofmann) +- Linux v6.8.0-0.rc2.56897d51886f +Resolves: rhbz#2120968 + +* Fri Feb 02 2024 Fedora Kernel Team [6.8.0-0.rc2.021533194476.22] +- Linux v6.8.0-0.rc2.021533194476 Resolves: * Thu Feb 01 2024 Fedora Kernel Team [6.8.0-0.rc2.6764c317b6bb.21] diff --git a/kernel.spec b/kernel.spec index 386c7bef4..a494e2715 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc2.20240201git6764c317b6bb.22 +%define pkgrelease 0.rc3.26 %define kversion 6 -%define tarfile_release 6.8-rc2-55-g6764c317b6bb +%define tarfile_release 6.8-rc3 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20240201git6764c317b6bb.22%{?buildid}%{?dist} +%define specrelease 0.rc3.26%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -669,9 +669,6 @@ BuildRequires: kernel-rpm-macros # glibc-static is required for a consistent build environment (specifically # CONFIG_CC_CAN_LINK_STATIC=y). BuildRequires: glibc-static -%ifnarch %{nobuildarches} noarch -BuildRequires: bpftool -%endif %if %{with_headers} BuildRequires: rsync %endif @@ -2636,7 +2633,12 @@ BuildKernel() { # Generate vmlinux.h and put it to kernel-devel path # zfcpdump build does not have btf anymore if [ "$Variant" != "zfcpdump" ]; then - bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/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_LDFLAGS="${BPFBOOTSTRAP_LDFLAGS}" %{?make_opts} %{?clang_make_opts} V=1 -C tools/bpf/bpftool bootstrap + + tools/bpf/bpftool/bootstrap/bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h fi # prune junk from kernel-devel @@ -2692,7 +2694,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libexecdir} cd linux-%{KVERREL} - %if %{with_debug} %if %{with_realtime} echo "building rt-debug" @@ -3838,12 +3839,30 @@ fi\ # # %changelog -* Thu Feb 01 2024 Fedora Kernel Team [6.8.0-0.rc2.6764c317b6bb.22] +* Sun Feb 04 2024 Fedora Kernel Team [6.8.0-0.rc3.26] +- tools/rv: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) +- tools/rtla: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) + +* Sun Feb 04 2024 Fedora Kernel Team [6.8.0-0.rc3.25] - Remove defines forcing tools on, they override cmdline (Justin M. Forbes) - Remove separate license tag for libperf (Justin M. Forbes) - Don't use upstream bpftool version for Fedora package (Justin M. Forbes) - Don't ship libperf.a in libperf-devel (Justin M. Forbes) - add libperf packages and enable perf, libperf, tools and bpftool packages (Thorsten Leemhuis) +- Linux v6.8.0-0.rc3 + +* Sun Feb 04 2024 Fedora Kernel Team [6.8.0-0.rc2.3f24fcdacd40.24] +- Linux v6.8.0-0.rc2.3f24fcdacd40 + +* Sat Feb 03 2024 Fedora Kernel Team [6.8.0-0.rc2.56897d51886f.23] +- Add scaffolding to build the kernel-headers package for Fedora (Justin M. Forbes) +- redhat/spec: use distro CFLAGS when building bootstrap bpftool (Artem Savkov) +- spec: use just-built bpftool for vmlinux.h generation (Yauheni Kaliuta) [2120968] +- gitlab-ci: enable native tools for Rawhide CI (Michael Hofmann) +- Linux v6.8.0-0.rc2.56897d51886f + +* Fri Feb 02 2024 Fedora Kernel Team [6.8.0-0.rc2.021533194476.22] +- Linux v6.8.0-0.rc2.021533194476 * Thu Feb 01 2024 Fedora Kernel Team [6.8.0-0.rc2.6764c317b6bb.21] - Linux v6.8.0-0.rc2.6764c317b6bb diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index 132080d77..f618ec172 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -71,7 +71,9 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 73 files changed, 2115 insertions(+), 207 deletions(-) + tools/tracing/rtla/Makefile | 7 +- + tools/verification/rv/Makefile | 7 +- + 75 files changed, 2127 insertions(+), 209 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 31b3a25680d0..52ff60af2044 100644 @@ -136,7 +138,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 6c0a4d294444..399bf8d1c14b 100644 +index a171eafce2a3..b33dad36cfa8 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1565,7 +1567,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 68e648b55767..b270026ba0ca 100644 +index d14413916f93..ff6cbc3fa509 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1576,7 +1578,7 @@ index 68e648b55767..b270026ba0ca 100644 #include #include #include -@@ -3087,6 +3088,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -3095,6 +3096,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); @@ -1682,7 +1684,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 85ab0fcf9e88..7b61fa7255d3 100644 +index 0d124a8ca9c3..fb3ade9a09b0 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -252,6 +252,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1695,7 +1697,7 @@ index 85ab0fcf9e88..7b61fa7255d3 100644 switch (status & 0x7ff) { case NVME_SC_SUCCESS: return BLK_STS_OK; -@@ -342,6 +345,7 @@ enum nvme_disposition { +@@ -366,6 +369,7 @@ enum nvme_disposition { COMPLETE, RETRY, FAILOVER, @@ -1703,7 +1705,7 @@ index 85ab0fcf9e88..7b61fa7255d3 100644 AUTHENTICATE, }; -@@ -353,15 +357,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -377,15 +381,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED) return AUTHENTICATE; @@ -1723,7 +1725,7 @@ index 85ab0fcf9e88..7b61fa7255d3 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -394,6 +399,14 @@ static inline void nvme_end_req(struct request *req) +@@ -422,6 +427,14 @@ static inline void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -1738,7 +1740,7 @@ index 85ab0fcf9e88..7b61fa7255d3 100644 void nvme_complete_rq(struct request *req) { struct nvme_ctrl *ctrl = nvme_req(req)->ctrl; -@@ -423,6 +436,9 @@ void nvme_complete_rq(struct request *req) +@@ -451,6 +464,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -1749,7 +1751,7 @@ index 85ab0fcf9e88..7b61fa7255d3 100644 #ifdef CONFIG_NVME_HOST_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 2dd4137a08b2..9b14eb637003 100644 +index 74de1e64aeea..1b0e59c232f8 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -1785,7 +1787,7 @@ index 2dd4137a08b2..9b14eb637003 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -912,8 +918,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -913,8 +919,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ @@ -1796,10 +1798,10 @@ index 2dd4137a08b2..9b14eb637003 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 030c80818240..f37d3ac77cdf 100644 +index 3897334e3950..5d321f2116a6 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -902,6 +902,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -919,6 +919,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_failover_req(struct request *req); @@ -1807,7 +1809,7 @@ index 030c80818240..f37d3ac77cdf 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid); -@@ -944,6 +945,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -961,6 +962,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } @@ -2160,10 +2162,10 @@ index 0833b3e6aa6e..104f819ce813 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index ffd7c99e24a3..da409b3d491b 100644 +index e38a4124f610..0a607946e5f9 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5788,6 +5788,13 @@ static void hub_event(struct work_struct *work) +@@ -5806,6 +5806,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -2219,7 +2221,7 @@ index 5f60f163bd56..6352c3cf4c3c 100644 } diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index dcba0f85dfe2..f5201dbb73a6 100644 +index 0f931d0c227d..e0234d6f4157 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5610,6 +5610,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) @@ -2344,7 +2346,7 @@ index d9ad21058eed..4424db2f92f5 100644 + #endif diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 185924c56378..8b4b5b42946a 100644 +index 76458b6d53da..b80d5835be72 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -411,6 +411,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) @@ -2407,10 +2409,10 @@ index 6717b15e798c..8e1d3eae1686 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index add9368e6314..a278f78f7ac8 100644 +index 7ab0d13672da..c39d66bd2123 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1620,6 +1620,7 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1621,6 +1621,7 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); @@ -2418,7 +2420,7 @@ index add9368e6314..a278f78f7ac8 100644 int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass); -@@ -2676,6 +2677,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) +@@ -2681,6 +2682,10 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) return false; } @@ -3728,7 +3730,7 @@ index 000000000000..616692b1ac11 + +#endif /* __RH_MESSAGES_H */ diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 795b21154446..9b9b8ef568fb 100644 +index 267b9a0a3abc..12612f58ca58 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,6 +22,7 @@ @@ -3739,7 +3741,7 @@ index 795b21154446..9b9b8ef568fb 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -2001,6 +2002,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1992,6 +1993,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -3752,7 +3754,7 @@ index 795b21154446..9b9b8ef568fb 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2061,6 +2068,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2052,6 +2059,7 @@ static void write_mod_c_file(struct module *mod) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); @@ -3834,10 +3836,10 @@ index cd84d8ea1dfb..e4c70a0312bc 100644 const struct lsm_id lockdown_lsmid = { diff --git a/security/security.c b/security/security.c -index 0144a98d3712..b2605b733410 100644 +index 3aaad75c9ce8..8c043d7957a8 100644 --- a/security/security.c +++ b/security/security.c -@@ -5473,6 +5473,18 @@ int security_locked_down(enum lockdown_reason what) +@@ -5508,6 +5508,18 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); @@ -3856,3 +3858,45 @@ index 0144a98d3712..b2605b733410 100644 #ifdef CONFIG_PERF_EVENTS /** * security_perf_event_open() - Check if a perf event open is allowed +diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile +index 2456a399eb9a..afd18c678ff5 100644 +--- a/tools/tracing/rtla/Makefile ++++ b/tools/tracing/rtla/Makefile +@@ -28,10 +28,15 @@ FOPTS := -flto=auto -ffat-lto-objects -fexceptions -fstack-protector-strong \ + -fasynchronous-unwind-tables -fstack-clash-protection + WOPTS := -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -Wno-maybe-uninitialized + ++ifeq ($(CC),clang) ++ FOPTS := $(filter-out -ffat-lto-objects, $(FOPTS)) ++ WOPTS := $(filter-out -Wno-maybe-uninitialized, $(WOPTS)) ++endif ++ + TRACEFS_HEADERS := $$($(PKG_CONFIG) --cflags libtracefs) + + CFLAGS := -O -g -DVERSION=\"$(VERSION)\" $(FOPTS) $(MOPTS) $(WOPTS) $(TRACEFS_HEADERS) $(EXTRA_CFLAGS) +-LDFLAGS := -ggdb $(EXTRA_LDFLAGS) ++LDFLAGS := -flto=auto -ggdb $(EXTRA_LDFLAGS) + LIBS := $$($(PKG_CONFIG) --libs libtracefs) + + SRC := $(wildcard src/*.c) +diff --git a/tools/verification/rv/Makefile b/tools/verification/rv/Makefile +index 3d0f3888a58c..485f8aeddbe0 100644 +--- a/tools/verification/rv/Makefile ++++ b/tools/verification/rv/Makefile +@@ -28,10 +28,15 @@ FOPTS := -flto=auto -ffat-lto-objects -fexceptions -fstack-protector-strong \ + -fasynchronous-unwind-tables -fstack-clash-protection + WOPTS := -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -Wno-maybe-uninitialized + ++ifeq ($(CC),clang) ++ FOPTS := $(filter-out -ffat-lto-objects, $(FOPTS)) ++ WOPTS := $(filter-out -Wno-maybe-uninitialized, $(WOPTS)) ++endif ++ + TRACEFS_HEADERS := $$($(PKG_CONFIG) --cflags libtracefs) + + CFLAGS := -O -g -DVERSION=\"$(VERSION)\" $(FOPTS) $(MOPTS) $(WOPTS) $(TRACEFS_HEADERS) $(EXTRA_CFLAGS) -I include +-LDFLAGS := -ggdb $(EXTRA_LDFLAGS) ++LDFLAGS := -flto=auto -ggdb $(EXTRA_LDFLAGS) + LIBS := $$($(PKG_CONFIG) --libs libtracefs) + + SRC := $(wildcard src/*.c) diff --git a/sources b/sources index b0f722aaf..b778b28c4 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.8-rc2-55-g6764c317b6bb.tar.xz) = a2b22c51f8c491eb2b936a8936b367707d6483752d82a6c40ed8c0638be268d51cde428b91f7aff73bf17c040f4719fd09bbbe78f68f816fb92efcda9bdd1921 -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = a55f3860774d0ec2aae74f8b2c8c6b0620fe412723b50e068885c579b948371fdfb7de3065b2cf93d201dd4b1cad2491da69d86c691f7bbc8bc9a6b32c0ff93c -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 872cbc401afeaa4721db1c45b7dee707f682d567f80b3f85686589063efb728515e21e6d5b3e68c8850147fb76bab557fe7d076521188a1146234aad8d4bd79d +SHA512 (linux-6.8-rc3.tar.xz) = 17b93ecbccbdad4f63b886021e19661ca85c500d9b64ba673f6c52380fa05fa309092daed142333b9de83adcd3417cc2ca3ae693d0076cb605da032845743104 +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = f0debbaa54fd26da354c58999fed898a3a60978965bbd9e8de7836346176544853c7a45b6f7ab57a4d2575fef0c8226af3e4508f08c95c64cac4556201cbd484 +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = a59d5b641bd97191988823cffb332c8f563a9a44e8a97625c2d4e7787126a8cfcffb5d7861e7a45d9f81812bc7de627968285a97aa2b0d06d9988ad46956ccb4