From 3f959c002269fe54c63be8883744c5ea7682797b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 14 Jun 2021 08:15:03 -0500 Subject: [PATCH] kernel-5.13.0-0.rc6.45 * Mon Jun 14 2021 Fedora Kernel Team [5.13.0-0.rc6.45] - Revert "powerpc: Switch to relative jump labels" (Don Zickus) - spec: Enable sefltests rpm build (Jiri Olsa) - spec: Allow bpf selftest/samples to fail (Jiri Olsa) - kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc) - kernel.spec: Add missing source files to kernel-selftests-internal (Jiri Benc) - kernel.spec: selftests: add net/forwarding to TARGETS list (Jiri Benc) - kernel.spec: selftests: add build requirement on libmnl-devel (Jiri Benc) - kernel.spec: add action.o to kernel-selftests-internal (Jiri Benc) - kernel.spec: avoid building bpftool repeatedly (Jiri Benc) - kernel.spec: selftests require python3 (Jiri Benc) - kernel.spec: skip selftests that failed to build (Jiri Benc) - kernel.spec: fix installation of bpf selftests (Jiri Benc) - redhat: fix samples and selftests make options (Jiri Benc) - kernel.spec: enable mptcp selftests for kernel-selftests-internal (Jiri Benc) - kernel.spec: Do not export shared objects from libexecdir to RPM Provides (Jiri Benc) - kernel.spec: add missing dependency for the which package (Jiri Benc) - kernel.spec: add netfilter selftests to kernel-selftests-internal (Jiri Benc) - kernel.spec: move slabinfo and page_owner_sort debuginfo to tools-debuginfo (Jiri Benc) - kernel.spec: package and ship VM tools (Jiri Benc) - configs: enable CONFIG_PAGE_OWNER (Jiri Benc) - kernel.spec: add coreutils (Jiri Benc) - kernel.spec: add netdevsim driver selftests to kernel-selftests-internal (Jiri Benc) - redhat/Makefile: Clean out the --without flags from the baseonly rule (Jiri Benc) - kernel.spec: Stop building unnecessary rpms for baseonly builds (Jiri Benc) - kernel.spec: disable more kabi switches for gcov build (Jiri Benc) - kernel.spec: Rename kabi-dw base (Jiri Benc) - kernel.spec: Fix error messages during build of zfcpdump kernel (Jiri Benc) - kernel.spec: perf: remove bpf examples (Jiri Benc) - kernel.spec: selftests should not depend on modules-internal (Jiri Benc) - kernel.spec: build samples (Jiri Benc) - kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc) - configs/ark/s390: set CONFIG_MARCH_Z14 and CONFIG_TUNE_Z15 (Philipp Rudo) [1876435] - configs/common/s390: Clean up CONFIG_{MARCH,TUNE}_Z* (Philipp Rudo) - configs/process_configs.sh: make use of dummy-tools (Philipp Rudo) - configs/common: disable CONFIG_INIT_STACK_ALL_{PATTERN,ZERO} (Philipp Rudo) - configs/common/aarch64: disable CONFIG_RELR (Philipp Rudo) Resolves: rhbz#1876435 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel.spec | 16 ++++++++-------- patch-5.13.0-redhat.patch | 2 +- sources | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index a50c7140f..46fed4564 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 = 42 +RHEL_RELEASE = 45 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 1cb1b8ce0..8edb0311b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/75a7840b5a3793c11a241e00f7b01c088d25017b - 75a7840b5a3793c11a241e00f7b01c088d25017b Revert "powerpc: Switch to relative jump labels" +https://gitlab.com/cki-project/kernel-ark/-/commit/fdb0a1456873aca1fa0f14c0461f81c82eea872b + fdb0a1456873aca1fa0f14c0461f81c82eea872b Revert "powerpc: Switch to relative jump labels" https://gitlab.com/cki-project/kernel-ark/-/commit/9ecb01bae94e7379d2da1b5e375241ea3b40ff3b 9ecb01bae94e7379d2da1b5e375241ea3b40ff3b bpf: Fix unprivileged_bpf_disabled setup diff --git a/kernel.spec b/kernel.spec index 5c2ba856e..2581f5fae 100755 --- a/kernel.spec +++ b/kernel.spec @@ -71,9 +71,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 0 +%define debugbuildsenabled 1 -%global distro_build 0.rc5.20210611git929d931f2b40.42 +%global distro_build 0.rc6.45 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -117,13 +117,13 @@ Summary: The Linux kernel %define kversion 5.13 %define rpmversion 5.13.0 -%define pkgrelease 0.rc5.20210611git929d931f2b40.42 +%define pkgrelease 0.rc6.45 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20210611git929d931f2b40.42%{?buildid}%{?dist} +%define specrelease 0.rc6.45%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -650,7 +650,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13-rc5-110-g929d931f2b40.tar.xz +Source0: linux-5.13-rc6.tar.xz Source1: Makefile.rhelver @@ -1319,8 +1319,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13-rc5-110-g929d931f2b40 -c -mv linux-5.13-rc5-110-g929d931f2b40 linux-%{KVERREL} +%setup -q -n kernel-5.13-rc6 -c +mv linux-5.13-rc6 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2877,7 +2877,7 @@ fi # # %changelog -* Fri Jun 11 2021 Fedora Kernel Team [5.13.0-0.rc5.20210611git929d931f2b40.42] +* Mon Jun 14 2021 Fedora Kernel Team [5.13.0-0.rc6.45] - Revert "powerpc: Switch to relative jump labels" (Don Zickus) - spec: Enable sefltests rpm build (Jiri Olsa) - spec: Allow bpf selftest/samples to fail (Jiri Olsa) diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index e98727316..1ad256aae 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -151,7 +151,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 144d4f8b7eb3..c57946dbc433 100644 +index ed669b2d705d..4b8f0c79ce41 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index ce03ddf2e..6fcb22978 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.13-rc5-110-g929d931f2b40.tar.xz) = 98e11913844f92ff8c1e73e6ee831f8ab51f31f1b6e05f177dd3fa451aefd7befb391a433b46bda5d45bc72fde1705db5b352deff5756293d5dc11c0efdea3b8 -SHA512 (kernel-abi-whitelists-5.13.0-0.rc5.20210611git929d931f2b40.42.tar.bz2) = 8ca79564738d1b40bbd28e9607c4e596c3f64407c7e3ee3d16707ef63d39ddb1cad5c9adc07bd14bda5fc606d60089cd79dbd0bb7cb8d5ac0a0c68964ed111f0 -SHA512 (kernel-kabi-dw-5.13.0-0.rc5.20210611git929d931f2b40.42.tar.bz2) = 0cad462500c3af23174411de846badbf06b4d61a9a1fbf07dae6b7a199be3afd9913e264952dca947ff7a999e75c48b9c43c9dbc1987a8a7f3cab78c6b693024 +SHA512 (linux-5.13-rc6.tar.xz) = 19f64ca855dd4ae193bda9840475b38d454a24b12def79dd8b4c9216c4a4d952a7da344a9452c60e2f6ad63c5f870711a70e286ca34e68b3f9a080d765ce94dd +SHA512 (kernel-abi-whitelists-5.13.0-0.rc6.45.tar.bz2) = 55e35ee715088d9eba63bd99d0b394722a88c04453d677d903699147b9096e1e5c3c9aa1e1ea70038d1512680da90d48bbaf2fb282602338301d3793a3cd9051 +SHA512 (kernel-kabi-dw-5.13.0-0.rc6.45.tar.bz2) = a1f62210b25784788bc1b73411f230bb2010ad0f58e71825c46b340b52aa64aad29c5bb6b7da794dae81b4602569ac1caa68ecc68031c23822d2e08fa463f756