From 274455a1400928c80abab9288426dbcc340b2b59 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Mon, 11 Oct 2021 16:02:58 -0400 Subject: [PATCH] kernel-5.14.0-7.el9 * Mon Oct 11 2021 Herton R. Krzesinski [5.14.0-7.el9] - redhat: Enable Nitro Enclaves driver on x86 for real (Vitaly Kuznetsov) [2011739] - redhat/.gitignore: Add rhel9 KABI files (Prarit Bhargava) [2009489] - hwmon: (k10temp) Add support for yellow carp (David Arcari) [1987069] - hwmon: (k10temp) Rework the temperature offset calculation (David Arcari) [1987069] - hwmon: (k10temp) Don't show Tdie for all Zen/Zen2/Zen3 CPU/APU (David Arcari) [1987069] - hwmon: (k10temp) Add additional missing Zen2 and Zen3 APUs (David Arcari) [1987069] - hwmon: (k10temp) support Zen3 APUs (David Arcari) [1987069] - selinux,smack: fix subjective/objective credential use mixups (Ondrej Mosnacek) [2008145] - redhat: kernel.spec: selftests: abort on build failure (Jiri Benc) [2004012] - Revert "bpf, selftests: Disable tests that need clang13" (Jiri Benc) [2004012] - selftests, bpf: Fix makefile dependencies on libbpf (Jiri Benc) [2004012] Resolves: rhbz#1987069, rhbz#2004012, rhbz#2008145, rhbz#2009489, rhbz#2011739 Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel-x86_64-debug-rhel.config | 3 ++- kernel-x86_64-rhel.config | 3 ++- kernel.spec | 27 ++++++++++++++++++++------- sources | 6 +++--- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 6ed49c2..23a2e6a 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 6 +RHEL_RELEASE = 7 # # Early y+1 numbering diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 779b9b6..ecb42e3 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -6580,6 +6580,7 @@ CONFIG_UWB_WHCI=m # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VBOXGUEST is not set # CONFIG_VBOXSF_FS is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set @@ -6753,7 +6754,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 638d481..35b8292 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -6558,6 +6558,7 @@ CONFIG_UWB_WHCI=m # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VBOXGUEST is not set # CONFIG_VBOXSF_FS is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set @@ -6731,7 +6732,7 @@ CONFIG_VIDEO_V4L2=m # CONFIG_VIPERBOARD_ADC is not set CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set -# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/kernel.spec b/kernel.spec index e24d940..11c95d7 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 6 +%global distro_build 7 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -124,13 +124,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 6.el9 +%define pkgrelease 7.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 6%{?buildid}%{?dist} +%define specrelease 7%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -671,7 +671,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-6.el9.tar.xz +Source0: linux-5.14.0-7.el9.tar.xz Source1: Makefile.rhelver @@ -1350,8 +1350,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-6.el9 -c -mv linux-5.14.0-6.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-7.el9 -c +mv linux-5.14.0-7.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2228,7 +2228,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool pushd tools/testing/selftests # We need to install here because we need to call make with ARCH set which # doesn't seem possible to do in the install section. -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" SKIP_TARGETS="" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install +%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" SKIP_TARGETS="" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install # 'make install' for bpf is broken and upstream refuses to fix it. # Install the needed files manually. @@ -2942,6 +2942,19 @@ fi # # %changelog +* Mon Oct 11 2021 Herton R. Krzesinski [5.14.0-7.el9] +- redhat: Enable Nitro Enclaves driver on x86 for real (Vitaly Kuznetsov) [2011739] +- redhat/.gitignore: Add rhel9 KABI files (Prarit Bhargava) [2009489] +- hwmon: (k10temp) Add support for yellow carp (David Arcari) [1987069] +- hwmon: (k10temp) Rework the temperature offset calculation (David Arcari) [1987069] +- hwmon: (k10temp) Don't show Tdie for all Zen/Zen2/Zen3 CPU/APU (David Arcari) [1987069] +- hwmon: (k10temp) Add additional missing Zen2 and Zen3 APUs (David Arcari) [1987069] +- hwmon: (k10temp) support Zen3 APUs (David Arcari) [1987069] +- selinux,smack: fix subjective/objective credential use mixups (Ondrej Mosnacek) [2008145] +- redhat: kernel.spec: selftests: abort on build failure (Jiri Benc) [2004012] +- Revert "bpf, selftests: Disable tests that need clang13" (Jiri Benc) [2004012] +- selftests, bpf: Fix makefile dependencies on libbpf (Jiri Benc) [2004012] + * Fri Oct 08 2021 Herton R. Krzesinski [5.14.0-6.el9] - pinctrl: Bulk conversion to generic_handle_domain_irq() (David Arcari) [2000232] - pinctrl: amd: Handle wake-up interrupt (David Arcari) [2000232] diff --git a/sources b/sources index 2bcf7d9..6551ecf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-6.el9.tar.xz) = 08ea0818ec93c9fb10eeed899fc84aee26d2ff4108906fad46e6024a0dd6c5d8aade0e98b891510d7d806f37b2f500edd794cf532879a8f6b65d4bacba9fa2b9 -SHA512 (kernel-abi-stablelists-5.14.0-6.tar.bz2) = 13f84842276a349b226f1fe8f0c217be6f321cbfd8ab6c348f9dc5d7bf2dde123787416966a953814cd7b136817a7c4362eda172e549383a381c3c42cd6b8a56 -SHA512 (kernel-kabi-dw-5.14.0-6.tar.bz2) = 0995d280b425227627e13450c58252b3cda7c3da234557d00aadf3aaa896b07d51f5f61422950b3e0413ae151d7b4fbc6b53c7ce2368098c610042a57323181d +SHA512 (linux-5.14.0-7.el9.tar.xz) = 105458245fabca9321812e213a4a860e886e440b41664b46842d8a21758d0537d72d97e5063b5f12ad2ed6d05be05c7c96bab19b5936aacac698355744aca1d3 +SHA512 (kernel-abi-stablelists-5.14.0-7.tar.bz2) = fa2071b347614baabe3366b56d65243572b96f26ec3350f8c50f0db2c5445749d6d07708a6a96d0d0bfaf67a175fa4f3ea18aa890d98a512ca3400c8738aa59c +SHA512 (kernel-kabi-dw-5.14.0-7.tar.bz2) = 25be5b075e7a0e9d2a2c69d569991e419b1dc5a8fda798ed124ee94eb0ff6140a2f72362181df1942286274b4c35035798f19ae610890b0fe08ada21adc5efc0