From 76dd46aa6a7bf8c7ccdc3e8c0f239561dabed735 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 3 Jun 2021 09:21:36 -0500 Subject: kernel-5.13.0-0.rc4.20210603git324c92e5e0ee.35 * Thu Jun 03 2021 Fedora Kernel Team [5.13.0-0.rc4.20210603git324c92e5e0ee.35] - 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) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-aarch64-debug-rhel.config | 8 ++++---- kernel-aarch64-rhel.config | 8 ++++---- kernel-ppc64le-debug-rhel.config | 4 ++-- kernel-ppc64le-rhel.config | 4 ++-- kernel-s390x-debug-rhel.config | 4 ++-- kernel-s390x-rhel.config | 4 ++-- kernel-s390x-zfcpdump-rhel.config | 4 ++-- kernel-x86_64-debug-rhel.config | 7 ++++--- kernel-x86_64-rhel.config | 7 ++++--- kernel.spec | 24 +++++++++++++++--------- sources | 6 +++--- 13 files changed, 47 insertions(+), 39 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 266eb58c0..4de1b9fe3 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 = 34 +RHEL_RELEASE = 35 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 61c801405..39435dd3f 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/b392c7f3dbb0b2be61e3c6b29d915aad923dff90 - b392c7f3dbb0b2be61e3c6b29d915aad923dff90 bpf: Fix unprivileged_bpf_disabled setup +https://gitlab.com/cki-project/kernel-ark/-/commit/9ecb01bae94e7379d2da1b5e375241ea3b40ff3b + 9ecb01bae94e7379d2da1b5e375241ea3b40ff3b bpf: Fix unprivileged_bpf_disabled setup https://gitlab.com/cki-project/kernel-ark/-/commit/217f590d1ac59c7253497adb15c8a81d59b8be95 217f590d1ac59c7253497adb15c8a81d59b8be95 nvme: nvme_mpath_init remove multipath check diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 6787877e9..edec2b91a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1965,7 +1965,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set CONFIG_HID_SENSOR_HUB=m @@ -4297,9 +4297,9 @@ CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_VMW is not set CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set -# CONFIG_PVPANIC is not set # CONFIG_PVPANIC_MMIO is not set -# CONFIG_PVPANIC_PCI is not set +CONFIG_PVPANIC_PCI=m +CONFIG_PVPANIC=y # CONFIG_PWM_ATMEL_TCB is not set CONFIG_PWM_BCM_IPROC=y # CONFIG_PWM_DEBUG is not set @@ -6275,7 +6275,7 @@ CONFIG_USERFAULTFD=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTS_NS=y -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m CONFIG_UWB=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index fd090a9c9..219c03f07 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1949,7 +1949,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set CONFIG_HID_SENSOR_HUB=m @@ -4276,9 +4276,9 @@ CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_VMW is not set CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set -# CONFIG_PVPANIC is not set # CONFIG_PVPANIC_MMIO is not set -# CONFIG_PVPANIC_PCI is not set +CONFIG_PVPANIC_PCI=m +CONFIG_PVPANIC=y # CONFIG_PWM_ATMEL_TCB is not set CONFIG_PWM_BCM_IPROC=y # CONFIG_PWM_DEBUG is not set @@ -6252,7 +6252,7 @@ CONFIG_USERFAULTFD=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTS_NS=y -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m CONFIG_UWB=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 4a681c467..ee9459450 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1815,7 +1815,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set # CONFIG_HID_SENSOR_HUB is not set @@ -6085,7 +6085,7 @@ CONFIG_USERFAULTFD=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTS_NS=y -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m CONFIG_UWB=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 0eab54772..a2f229605 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1799,7 +1799,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set # CONFIG_HID_SENSOR_HUB is not set @@ -6066,7 +6066,7 @@ CONFIG_USERFAULTFD=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTS_NS=y -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m CONFIG_UWB=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 0c8328348..f84b4c9c5 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1814,7 +1814,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set # CONFIG_HID_SENSOR_HUB is not set @@ -6036,7 +6036,7 @@ CONFIG_USERFAULTFD=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTS_NS=y -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m # CONFIG_UWB is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 71126148e..23a90382f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1798,7 +1798,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set # CONFIG_HID_SENSOR_HUB is not set @@ -6017,7 +6017,7 @@ CONFIG_USERFAULTFD=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTS_NS=y -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m # CONFIG_UWB is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index cf76299a7..9641283f6 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1811,7 +1811,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set # CONFIG_HID_SENSOR_HUB is not set @@ -6051,7 +6051,7 @@ CONFIG_USERFAULTFD=y # CONFIG_USERIO is not set CONFIG_USER_NS=y CONFIG_UTS_NS=y -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m # CONFIG_UWB is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index c68400e19..98a91b041 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1932,7 +1932,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m CONFIG_HID_SENSOR_ACCEL_3D=m CONFIG_HID_SENSOR_ALS=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set @@ -3841,6 +3841,7 @@ CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -4303,7 +4304,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set CONFIG_PVH=y -# CONFIG_PVPANIC_MMIO is not set +CONFIG_PVPANIC_MMIO=m # CONFIG_PVPANIC_PCI is not set CONFIG_PVPANIC=y # CONFIG_PWM_ATMEL_TCB is not set @@ -6326,7 +6327,7 @@ CONFIG_USERFAULTFD=y CONFIG_USER_NS=y CONFIG_UTS_NS=y CONFIG_UV_MMTIMER=m -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m CONFIG_UWB=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 82863350d..4ab7cbf92 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1916,7 +1916,7 @@ CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m -# CONFIG_HID_SEMITEK is not set +CONFIG_HID_SEMITEK=m CONFIG_HID_SENSOR_ACCEL_3D=m CONFIG_HID_SENSOR_ALS=m # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set @@ -3822,6 +3822,7 @@ CONFIG_N_HDLC=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +CONFIG_NITRO_ENCLAVES=m # CONFIG_NL80211_TESTMODE is not set CONFIG_NLMON=m CONFIG_NLS_ASCII=y @@ -4283,7 +4284,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set CONFIG_PVH=y -# CONFIG_PVPANIC_MMIO is not set +CONFIG_PVPANIC_MMIO=m # CONFIG_PVPANIC_PCI is not set CONFIG_PVPANIC=y # CONFIG_PWM_ATMEL_TCB is not set @@ -6304,7 +6305,7 @@ CONFIG_USERFAULTFD=y CONFIG_USER_NS=y CONFIG_UTS_NS=y CONFIG_UV_MMTIMER=m -CONFIG_UV_SYSFS=y +CONFIG_UV_SYSFS=m CONFIG_UWB_HWA=m CONFIG_UWB_I1480U=m CONFIG_UWB=m diff --git a/kernel.spec b/kernel.spec index d65f411f3..1aebd9cbb 100755 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc4.20210602git231bc5390667.34 +%global distro_build 0.rc4.20210603git324c92e5e0ee.35 %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.rc4.20210602git231bc5390667.34 +%define pkgrelease 0.rc4.20210603git324c92e5e0ee.35 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20210602git231bc5390667.34%{?buildid}%{?dist} +%define specrelease 0.rc4.20210603git324c92e5e0ee.35%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -647,7 +647,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13-rc4-48-g231bc5390667.tar.xz +Source0: linux-5.13-rc4-61-g324c92e5e0ee.tar.xz Source1: Makefile.rhelver @@ -1316,8 +1316,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13-rc4-48-g231bc5390667 -c -mv linux-5.13-rc4-48-g231bc5390667 linux-%{KVERREL} +%setup -q -n kernel-5.13-rc4-61-g324c92e5e0ee -c +mv linux-5.13-rc4-61-g324c92e5e0ee linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2871,9 +2871,7 @@ fi # # %changelog -* Wed Jun 02 2021 Fedora Kernel Team [5.13.0-0.rc4.20210602git231bc5390667.34] -- bpf: Fix unprivileged_bpf_disabled setup (Jiri Olsa) -- Enable CONFIG_BPF_UNPRIV_DEFAULT_OFF (Jiri Olsa) +* Thu Jun 03 2021 Fedora Kernel Team [5.13.0-0.rc4.20210603git324c92e5e0ee.35] - 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) @@ -2905,6 +2903,14 @@ fi - kernel.spec: build samples (Jiri Benc) - kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc) +* Thu Jun 03 2021 Fedora Kernel Team [5.13.0-0.rc4.20210603git324c92e5e0ee.34] +- all: Changing CONFIG_UV_SYSFS to build uv_sysfs.ko as a loadable module. (Frank Ramsay) +- Enable NITRO_ENCLAVES on RHEL (Vitaly Kuznetsov) +- Update the Quick Start documentation (David Ward) +- redhat/configs: Set PVPANIC_MMIO for x86 and PVPANIC_PCI for aarch64 (Eric Auger) [1961178] +- bpf: Fix unprivileged_bpf_disabled setup (Jiri Olsa) +- Enable CONFIG_BPF_UNPRIV_DEFAULT_OFF (Jiri Olsa) + * Tue Jun 01 2021 Fedora Kernel Team [5.13.0-0.rc4.20210601gitc2131f7e73c9.32] - configs/common/s390: disable CONFIG_QETH_{OSN,OSX} (Philipp Rudo) [1903201] diff --git a/sources b/sources index 0f29f048d..29ff58bf6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.13-rc4-48-g231bc5390667.tar.xz) = 5590552205151e732b00589d02919d625968ab7fd9e1fcada33dc58799e1a1caae2bedffdf9fdb40351353519b8e573fec71e6d42578d56953512856a38f959f -SHA512 (kernel-abi-whitelists-5.13.0-0.rc4.20210602git231bc5390667.34.tar.bz2) = 5d789a6d5a11b713ad3dd521dbb5ce86cb70f4a2a3f24b62d3f98ed1119507aba735b06a0105ce0c16545fda52505ae1d03eafa060080175dc1644e67872bf2f -SHA512 (kernel-kabi-dw-5.13.0-0.rc4.20210602git231bc5390667.34.tar.bz2) = 04584e1f822751e9e102274b6963faa17f3ffcb612f922c780470256d80282bd1998d6f0bcb080550041f5642d88853aed5f2431f1476f14c3d432eb63b504bb +SHA512 (linux-5.13-rc4-61-g324c92e5e0ee.tar.xz) = ac6bb59f3c1adc7103cefd9bba73e6777ab7519401639392768813ce134b6e20f3903060c77db8a039efd840ff9d95d32528df787429d714886a058b1297ea07 +SHA512 (kernel-abi-whitelists-5.13.0-0.rc4.20210603git324c92e5e0ee.35.tar.bz2) = de6243ba194d42e5389b2eb22c173ff1a388abc5c4b92d1d14d82bfe203cd032fdbe92260d27556831ad06092442706e1bfc16f86fea1d77b4c05a0b380c70ad +SHA512 (kernel-kabi-dw-5.13.0-0.rc4.20210603git324c92e5e0ee.35.tar.bz2) = aece5675a70a4b2aa93431ce781ebfbe84f1648056a9d36c09f9641bdbb289a7c220c4f05c51b40cec16f3883302d8d3d770295fb08c70694394136bc371e1f3 -- cgit