diff --git a/Makefile.rhelver b/Makefile.rhelver index 1885d4e36..4ae876358 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 = 73 +RHEL_RELEASE = 74 # # ZSTREAM diff --git a/kernel.spec b/kernel.spec index c39723de8..2d885697b 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 73.el9 +%define pkgrelease 74.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 73%{?buildid}%{?dist} +%define specrelease 74%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -676,7 +676,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-73.el9.tar.xz +Source0: linux-5.14.0-74.el9.tar.xz Source1: Makefile.rhelver @@ -1346,8 +1346,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-73.el9 -c -mv linux-5.14.0-73.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-74.el9 -c +mv linux-5.14.0-74.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2966,6 +2966,11 @@ fi # # %changelog +* Tue Mar 22 2022 Patrick Talbert [5.14.0-74.el9] +- redhat: rpminspect: disable 'patches' check for known empty patch files (Patrick Talbert) +- KVM: x86/mmu: Don't advance iterator after restart due to yielding (Nico Pache) [2055725] +- ibmvnic: don't release napi in __ibmvnic_open() (Diego Domingos) [2055981] + * Sun Mar 20 2022 Patrick Talbert [5.14.0-73.el9] - CI: Use 9.0-rt branch for rhel-9 realtime_check (Juri Lelli) - redhat: enable zstream release numbering for rhel 9.0 (Herton R. Krzesinski) diff --git a/rpminspect.yaml b/rpminspect.yaml index 4c059887f..727e877fe 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -19,3 +19,8 @@ emptyrpm: - kernel-zfcpdump - kernel-zfcpdump-devel-matched - kernel-zfcpdump-modules + +patches: + ignore_list: + - linux-kernel-test.patch + - patch-5.14.0-redhat.patch diff --git a/sources b/sources index cadc731f6..bdf155a4c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-73.el9.tar.xz) = cdd89891ac8afc5aa7a38113968b3d750fcf7618cb91b19a9aed95d2b929c01ab0367a17249452cd4632b6e577a7431b22d31d9fe76a9edd81f0c5b901d5a388 -SHA512 (kernel-abi-stablelists-5.14.0-73.el9.tar.bz2) = 463114f715d4dc1446c48596f881d8de126aefdd946659786c10afd21b291302439f56cf3deaaa1d2ecf471eafb36d63be278123374172062ec0811a2b607761 -SHA512 (kernel-kabi-dw-5.14.0-73.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674 +SHA512 (linux-5.14.0-74.el9.tar.xz) = 2eb3b88dd351b8f24898f32fd3f2fba3e9091086eb170790a1601d082f5ecd22bdc94c8f98795ba6f46ef33cb8aee435621b85063b31d7af5485ff6874225a07 +SHA512 (kernel-abi-stablelists-5.14.0-74.el9.tar.bz2) = fd6378513c3b3b21e3a95c4480b2ffd4af6f6a2edf787d1c539cbf1e9d6e0af555c0eb79d8a55e160534c6480bd423619ad2a4f117a34d2aa3deb0c87bb753fa +SHA512 (kernel-kabi-dw-5.14.0-74.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674