diff --git a/.kernel-automotive.metadata b/.kernel-automotive.metadata index f3278f1..ab866bc 100644 --- a/.kernel-automotive.metadata +++ b/.kernel-automotive.metadata @@ -1 +1 @@ -9c9c002613650757a6817f34912215417927f299 SOURCES/linux-5.14.0-73.38.el9.tar.xz +ed7d5557df844e67c59c6d8f5196f0d9f3d00309 SOURCES/linux-5.14.0-74.39.el9.tar.xz diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 646e46c..a052b22 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/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 @@ -41,7 +41,7 @@ ZSTREAM ?= no # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -AUTOMOTIVEBUILD:=.38 +AUTOMOTIVEBUILD:=.39 # # Early y+1 numbering @@ -73,4 +73,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.73 +RTBUILD:=.74 diff --git a/SOURCES/rpminspect.yaml b/SOURCES/rpminspect.yaml index 4b0bad7..9fe188b 100644 --- a/SOURCES/rpminspect.yaml +++ b/SOURCES/rpminspect.yaml @@ -19,6 +19,12 @@ emptyrpm: - kernel-zfcpdump - kernel-zfcpdump-devel-matched - kernel-zfcpdump-modules + +patches: + ignore_list: + - linux-kernel-test.patch + - patch-5.14.0-redhat.patch + specname: match: prefix primary: filename diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index c1e4d53..97600fa 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -121,13 +121,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 73.38.el9 +%define pkgrelease 74.39.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 73.38%{?buildid}%{?dist} +%define specrelease 74.39%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -275,7 +275,7 @@ Summary: The Linux kernel %endif %if %{with_automotive} -%global automotivebuild .38 +%global automotivebuild .39 %define with_doc 0 %define with_headers 0 %define with_cross_headers 0 @@ -698,7 +698,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-73.38.el9.tar.xz +Source0: linux-5.14.0-74.39.el9.tar.xz Source1: Makefile.rhelver @@ -1408,8 +1408,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-73.38.el9 -c -mv linux-5.14.0-73.38.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-74.39.el9 -c +mv linux-5.14.0-74.39.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3086,6 +3086,12 @@ fi # # %changelog +* Fri Apr 08 2022 Scott Weaver [5.14.0-74.39.el9] +- [rt] build kernel-automotive-5.14.0-74.39.el9 [2061574] +- 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] + * Mon Apr 04 2022 Julio Faracco [5.14.0-73.38.el9] - [rt] build kernel-automotive-5.14.0-73.38.el9 [2061574] - CI: Use 9.0-rt branch for rhel-9 realtime_check (Juri Lelli)