From 297803ccb2c725230ae3974dc45243c7d90bfc63 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 29 Apr 2025 09:38:27 -0600 Subject: [PATCH] kernel-6.15.0-0.rc4.20250429gitca91b9500108.36 * Tue Apr 29 2025 Fedora Kernel Team [6.15.0-0.rc4.ca91b9500108.36] - redhat/spec: fix selftests dependencies (Gregory Bell) [RHEL-88228] - redhat: add namespace selftests to kernel-modules-internal package (Joel Savitz) [RHEL-88635] - Turn off CONFIG_PCI_REALLOC_ENABLE_AUTO for Fedora (Justin M. Forbes) - Linux v6.15.0-0.rc4.ca91b9500108 Resolves: RHEL-88228, RHEL-88635 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 7 +++++++ kernel.spec | 27 +++++++++++++++++++++------ sources | 6 +++--- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5d060b30e..3e689598c 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 = 35 +RHEL_RELEASE = 36 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 0df258433..0636cc7f9 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,10 @@ +* Tue Apr 29 2025 Fedora Kernel Team [6.15.0-0.rc4.ca91b9500108.36] +- redhat/spec: fix selftests dependencies (Gregory Bell) [RHEL-88228] +- redhat: add namespace selftests to kernel-modules-internal package (Joel Savitz) [RHEL-88635] +- Turn off CONFIG_PCI_REALLOC_ENABLE_AUTO for Fedora (Justin M. Forbes) +- Linux v6.15.0-0.rc4.ca91b9500108 +Resolves: RHEL-88228, RHEL-88635 + * Mon Apr 28 2025 Fedora Kernel Team [6.15.0-0.rc4.35] - Linux v6.15.0-0.rc4 Resolves: diff --git a/kernel.spec b/kernel.spec index 022bd59a5..9a8905297 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.rc4.35 +%define pkgrelease 0.rc4.20250429gitca91b9500108.36 %define kversion 6 -%define tarfile_release 6.15-rc4 +%define tarfile_release 6.15-rc4-21-gca91b9500108 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.35%{?buildid}%{?dist} +%define specrelease 0.rc4.20250429gitca91b9500108.36%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -768,7 +768,7 @@ BuildRequires: (python3-wheel if python3-setuptools < 70) BuildRequires: openssl-devel %endif %if %{with_selftests} -BuildRequires: clang llvm-devel fuse-devel zlib-devel binutils-devel +BuildRequires: clang llvm-devel fuse-devel zlib-devel binutils-devel python3-docutils python3-jsonschema %ifarch x86_64 riscv64 BuildRequires: lld %endif @@ -3202,7 +3202,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 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 +%{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 pid_namespace rlimits" 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 @@ -3592,6 +3592,18 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/iommu/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/iommu/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/iommu/{} \; popd +# install rlimits selftests +pushd tools/testing/selftests/rlimits +find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/rlimits/{} \; +find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/rlimits/{} \; +find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/rlimits/{} \; +popd +# install pid_namespace selftests +pushd tools/testing/selftests/pid_namespace +find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/pid_namespace/{} \; +find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/pid_namespace/{} \; +find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/pid_namespace/{} \; +popd %endif ### @@ -4259,8 +4271,11 @@ fi\ # # %changelog -* Mon Apr 28 2025 Justin M. Forbes [6.15.0-0.rc4.35] +* Tue Apr 29 2025 Fedora Kernel Team [6.15.0-0.rc4.ca91b9500108.36] +- redhat/spec: fix selftests dependencies (Gregory Bell) [RHEL-88228] +- redhat: add namespace selftests to kernel-modules-internal package (Joel Savitz) [RHEL-88635] - Turn off CONFIG_PCI_REALLOC_ENABLE_AUTO for Fedora (Justin M. Forbes) +- Linux v6.15.0-0.rc4.ca91b9500108 * Mon Apr 28 2025 Fedora Kernel Team [6.15.0-0.rc4.35] - Linux v6.15.0-0.rc4 diff --git a/sources b/sources index cab0c36cf..bacbfb8a5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.15-rc4.tar.xz) = 55c90f1b3f5b2cf7aae2df918c52a26e81ff01033285ef01ec67cc2106f02e4eec6c6cd665c87f84f2791259aedd6f73f336104a6c83168824f35a847a9f9442 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = dae25beb186bb412e32f6ff791674dc5b377bc9ab2aa06ebb9d0ee6bec4fb5eb6333553920bce4a7e1b37417089f7600957f1483701826dd54a27926c3e9fa6e -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = bce66d8fd5912b0bd9c08eb4133c4e4cb9fbb0d8e81d03a83502dac756b0ee42d915c006518d49d495f7fad07e9b5b3839ffddaba88ede9f6d28c2d8c33734b3 +SHA512 (linux-6.15-rc4-21-gca91b9500108.tar.xz) = a779620a53ee385529f14f9edeff8c4f150119046d8d9eee3778019a966117b27708e787e18f9ee4706d10d71ace55c9182911c8c98860a7cd7364aedce17694 +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = a79b247f8517a333ae6858739f27f2a48ca1f72d64bfeb86bbb141a0136280c1d052e8bc2078c6d5755e50972b25dc4b32952b744c43fa443a90d0f877adeb4b +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 4d708ac982b111e0c8672c501049d08c2b42f26514e3549ab502183a8429ebb81be51f13f1835896dea82f5ec6e2518b99b203709aaf751679643a8b14065de1