kernel-5.15-0.rc6.20211021git2f111a6fd5b5.49

* Thu Oct 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc6.20211021git2f111a6fd5b5.49] - Revert "bpf, selftests: Disable tests that need clang13" (Jiri Olsa) - spec: Don't fail spec build if ksamples fails (Jiri Olsa) - Enable CONFIG_QCOM_SCM for arm (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2021-10-21 08:52:39 -05:00 · 2021-10-21 08:52:39 -05:00 · 603ebd7fd9
parent 9d0424b3fb
commit 603ebd7fd9
14 changed files with 57 additions and 1478 deletions
--- 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 = 47
+RHEL_RELEASE = 49

 #
 # Early y+1 numbering
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/5ad158bfea74aec50281bacc90a21315bd55d447
+ 5ad158bfea74aec50281bacc90a21315bd55d447 Revert "bpf, selftests: Disable tests that need clang13"
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/1739846090d60287d56220b3a984603158668acb
 1739846090d60287d56220b3a984603158668acb redhat: Add mark_driver_deprecated()

--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -2308,7 +2308,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -2292,7 +2292,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -2133,7 +2133,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
@ -4265,7 +4265,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -2117,7 +2117,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
@ -4247,7 +4247,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -2116,7 +2116,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
@ -4199,7 +4199,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -2100,7 +2100,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
@ -4181,7 +4181,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -2114,7 +2114,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
@ -4204,7 +4204,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -2269,7 +2269,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
@ -4443,7 +4443,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -2253,7 +2253,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
 CONFIG_IMA_SIG_TEMPLATE=y
 # CONFIG_IMA_TEMPLATE is not set
 CONFIG_IMA_TRUSTED_KEYRING=y
-# CONFIG_IMA_WRITE_POLICY is not set
+CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_SC_WDT is not set
@ -4422,7 +4422,6 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 # CONFIG_QCOM_QFPROM is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SMEM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
--- a/kernel.spec
+++ b/kernel.spec
@ -83,9 +83,9 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0

-%global distro_build 0.rc6.47
+%global distro_build 0.rc6.20211021git2f111a6fd5b5.49

 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@ -130,13 +130,13 @@ Summary: The Linux kernel

 %define rpmversion 5.15.0
 %define patchversion 5.15
-%define pkgrelease 0.rc6.47
+%define pkgrelease 0.rc6.20211021git2f111a6fd5b5.49

 # This is needed to do merge window version magic
 %define patchlevel 15

 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.47%{?buildid}%{?dist}
+%define specrelease 0.rc6.20211021git2f111a6fd5b5.49%{?buildid}%{?dist}

 %define pkg_release %{specrelease}

@ -247,9 +247,14 @@ Summary: The Linux kernel
 %endif

 %if %{with toolchain_clang}
-%global clang_make_opts HOSTCC=clang CC=clang
+%ifarch s390x ppc64le
+%global llvm_ias 0
+%else
+%global llvm_ias 1
+%endif
+%global clang_make_opts HOSTCC=clang CC=clang LLVM_IAS=%{llvm_ias}
 %if %{with clang_lto}
-%global clang_make_opts %{clang_make_opts} LD=ld.lld HOSTLD=ld.lld AR=llvm-ar NM=llvm-nm HOSTAR=llvm-ar HOSTNM=llvm-nm LLVM_IAS=1
+%global clang_make_opts %{clang_make_opts} LD=ld.lld HOSTLD=ld.lld AR=llvm-ar NM=llvm-nm HOSTAR=llvm-ar HOSTNM=llvm-nm
 %endif
 %global make_opts %{make_opts} %{clang_make_opts}
 # clang does not support the -fdump-ipa-clones option
@ -433,8 +438,6 @@ Summary: The Linux kernel
 %define kernel_image vmlinux
 %define kernel_image_elf 1
 %define use_vdso 0
-# Currently very broken for ppc
-%define with_selftests 0
 %define all_arch_configs kernel-%{version}-ppc64le*.config
 %endif

@ -679,7 +682,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15-rc6.tar.xz
+Source0: linux-5.15-rc6-70-g2f111a6fd5b5.tar.xz

 Source1: Makefile.rhelver

@ -1370,8 +1373,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.15-rc6 -c
-mv linux-5.15-rc6 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc6-70-g2f111a6fd5b5 -c
+mv linux-5.15-rc6-70-g2f111a6fd5b5 linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -2248,7 +2251,7 @@ popd
 # in the source tree. We installed them previously to $RPM_BUILD_ROOT/usr
 # but there's no way to tell the Makefile to take them from there.
 %{make} %{?_smp_mflags} headers_install
-%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/
+%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ || true

 # Prevent bpf selftests to build bpftool repeatedly:
 export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
@ -2970,8 +2973,14 @@ fi
 #
 #
 %changelog
-* Mon Oct 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc6.47]
- Temporarily turn off selftests for bpf on ppc (Justin M. Forbes)
+* Thu Oct 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc6.20211021git2f111a6fd5b5.49]
+- Revert "bpf, selftests: Disable tests that need clang13" (Jiri Olsa)
+- spec: Don't fail spec build if ksamples fails (Jiri Olsa)
+- Enable CONFIG_QCOM_SCM for arm (Justin M. Forbes)
+
+* Tue Oct 19 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc6.47]
+- redhat: Disable clang's integrated assembler on ppc64le and s390x (Tom Stellard)
+- redhat/configs: enable CONFIG_IMA_WRITE_POLICY (Bruno Meneguele)

 * Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.43]
 - Fix dist-srpm-gcov (Don Zickus)
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.15-rc6.tar.xz) = 04671e42f2a5fc1c3c31a4a7d808b53f99ac9712a753c498a97150ff3b74becba13c75a0b99066f459d84bdda1d3372eb2703d913ce0ac35e48e6bdadecb9f18
-SHA512 (kernel-abi-stablelists-5.15.0-0.rc6.47.tar.bz2) = 01317b052d6024907eed74bc6e4543ad8fe2dc3ccc08097d34eeaa6ccc747ef2d6ac119b8939ab9602826b1081f6b50b3624193d9039d9a73e3f2d56fbb9f973
-SHA512 (kernel-kabi-dw-5.15.0-0.rc6.47.tar.bz2) = b0a77f19a3d9938073300eeec99c7d74be2772860f841b04f8e9c2859c040e4261494450954dd6f6c797530230db8cd2c59151cb321412c72b8f4bb067280c1d
+SHA512 (linux-5.15-rc6-70-g2f111a6fd5b5.tar.xz) = 5db7d928723586318dae76872fcf80f613926d1c43e1f11c7710d19606950974305455c37810bd02c2141ac07dccd8ed6781d054425dd46172f8a99b1acb134d
+SHA512 (kernel-abi-stablelists-5.15.0-0.rc6.20211021git2f111a6fd5b5.49.tar.bz2) = 114a766191643d9cb774f5b83cfa426245f1919bcddaf368bdfcd65ac9ee4e7b257bfe5285c6276f91f16f9d8f6421b72fe51ca17e02db1437f0541f55522c55
+SHA512 (kernel-kabi-dw-5.15.0-0.rc6.20211021git2f111a6fd5b5.49.tar.bz2) = a7f6181e7bcc54ca257d6ba7673d829497c63e882a046554c66c73e193ca243bc9cdd25c5ab6396a44dc08ad0ef2b11d26127125a013acddce25ed8c546a219a