diff --git a/Makefile.rhelver b/Makefile.rhelver index f36b1c6b1..f50482b19 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 133 +RHEL_RELEASE = 134 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 11b4c2a90..fe78559ff 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1661,6 +1661,7 @@ CONFIG_FB=y CONFIG_FEC=m CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 15b1443d8..9c308b47b 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1645,6 +1645,7 @@ CONFIG_FB=y CONFIG_FEC=m CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 440496040..000e2b479 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1448,6 +1448,7 @@ CONFIG_FB=y # CONFIG_FEALNX is not set CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 1658f0f32..24f15bf3d 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1432,6 +1432,7 @@ CONFIG_FB=y # CONFIG_FEALNX is not set CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index eddd80be6..6862d270b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1453,6 +1453,7 @@ CONFIG_FB_VESA=y # CONFIG_FEALNX is not set CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 9656aab57..d11d26058 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1437,6 +1437,7 @@ CONFIG_FB_VESA=y # CONFIG_FEALNX is not set CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 04d741c23..3f978be73 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1445,6 +1445,7 @@ CONFIG_FB_VESA=y # CONFIG_FEALNX is not set CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index d3e8db0f9..c1e97f940 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1557,6 +1557,7 @@ CONFIG_FCOE_FNIC=m # CONFIG_FEALNX is not set CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 67b981bbb..56ce61469 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1541,6 +1541,7 @@ CONFIG_FCOE_FNIC=m # CONFIG_FEALNX is not set CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set +CONFIG_FIPS_SIGNATURE_SELFTEST=y # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_EDID is not set diff --git a/kernel.spec b/kernel.spec index 7af573d1f..b60dda0ee 100755 --- a/kernel.spec +++ b/kernel.spec @@ -121,13 +121,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 133.el9 +%define pkgrelease 134.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 133%{?buildid}%{?dist} +%define specrelease 134%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -679,7 +679,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-133.el9.tar.xz +Source0: linux-5.14.0-134.el9.tar.xz Source1: Makefile.rhelver @@ -1225,7 +1225,7 @@ The meta-package for the %{1} kernel\ # %%define variant_summary The Linux kernel compiled for # %%kernel_variant_package [-n ] [-m] [-o] # -%define kernel_variant_package(n:m:o) \ +%define kernel_variant_package(n:mo) \ %package %{?1:%{1}-}core\ Summary: %{variant_summary}\ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\ @@ -1351,8 +1351,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-133.el9 -c -mv linux-5.14.0-133.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-134.el9 -c +mv linux-5.14.0-134.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3009,6 +3009,16 @@ fi # # %changelog +* Thu Jul 21 2022 Patrick Talbert [5.14.0-134.el9] +- redhat: fix kernel_variant_package option definition (Herton R. Krzesinski) +- audit: free module name (Richard Guy Briggs) [2100261] +- audit,io_uring,io-wq: call __audit_uring_exit for dummy contexts (Richard Guy Briggs) [2100261] +- certs: Add FIPS selftests (David Howells) [2080044] +- certs: Move load_certificate_list() to be with the asymmetric keys code (David Howells) [2080044] +- scsi: core: Add scsi_done_direct() for immediate completion (Ewan D. Milne) [2094105] +- scsi: core: Rename scsi_mq_done() into scsi_done() and export it (Ewan D. Milne) [2094105] +- scsi: core: Use a structure member to track the SCSI command submitter (Ewan D. Milne) [2094105] + * Wed Jul 20 2022 Patrick Talbert [5.14.0-133.el9] - lockd: fix nlm_close_files (Jeffrey Layton) [2082816] - lockd: set fl_owner when unlocking files (Jeffrey Layton) [2082816] diff --git a/sources b/sources index 06da211eb..09047d0f1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-133.el9.tar.xz) = 671d08d39c134d41a2870b0534f91eb4d4ac30c9ba2bf7f6c919a4a8436958ac554c718417d4541c9177929b8f474da3585467326bd0feb2d7caea7a837153db -SHA512 (kernel-abi-stablelists-5.14.0-133.el9.tar.bz2) = 34d06b809335ddfc4be1f417000f483965f4d12054025ce588b03cf9eabd97c992bae43550648b381def671158603e4f4b278182d9aed5de62acaa8ab023cdbc -SHA512 (kernel-kabi-dw-5.14.0-133.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674 +SHA512 (linux-5.14.0-134.el9.tar.xz) = 9f38296dc79cd03978d27199bfcd9dd4843be3a1043540495578cc575ff5ef9a29b816917d5fc140c7c02c9da24a8a4800eb008d5667aa27762cf3eccc7592c7 +SHA512 (kernel-abi-stablelists-5.14.0-134.el9.tar.bz2) = bdc4aa28acad7364d08a3a686c8228cddaa3b896971129bf81c727367f677b8dca570aac2fa31b14a292bad1af8f5ffaef908e29bdb8d87af7468d8ea814f697 +SHA512 (kernel-kabi-dw-5.14.0-134.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674