From 9569c62431c33b842f3df0ff942da381989dea43 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Mon, 13 Sep 2021 18:19:26 -0400 Subject: [PATCH] kernel-5.14.0-2.el9 * Mon Sep 13 2021 Herton R. Krzesinski [5.14-2] - redhat: update branches/targets after 9 Beta fork (Herton R. Krzesinski) - hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer (Vitaly Kuznetsov) [1996628] - Enable bridge jobs for scratch pipelines (Michael Hofmann) Resolves: rhbz#1996628 Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel.spec | 17 +++++++++++------ sources | 6 +++--- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 1b87111..101a681 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 = 1 +RHEL_RELEASE = 2 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index 43e348d..677ddac 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 1 +%global distro_build 2 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -125,13 +125,13 @@ Summary: The Linux kernel %define rpmversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 1 +%define pkgrelease 2 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1%{?buildid}%{?dist} +%define specrelease 2%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -672,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-1.tar.xz +Source0: linux-5.14.0-2.tar.xz Source1: Makefile.rhelver @@ -1357,8 +1357,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-1 -c -mv linux-5.14.0-1 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-2 -c +mv linux-5.14.0-2 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2957,6 +2957,11 @@ fi # # %changelog +* Mon Sep 13 2021 Herton R. Krzesinski [5.14-2] +- redhat: update branches/targets after 9 Beta fork (Herton R. Krzesinski) +- hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer (Vitaly Kuznetsov) [1996628] +- Enable bridge jobs for scratch pipelines (Michael Hofmann) + * Mon Aug 30 2021 Herton R. Krzesinski [5.14-1] - redhat: drop Patchlist.changelog for RHEL (Jan Stancek) [1997494] - redhat: update Makefile.variables for centos/rhel9 fork (Herton R. Krzesinski) diff --git a/sources b/sources index 21d8bc1..dd57a08 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-1.tar.xz) = f22cbf296900d811b1859fbece7f2bd587933c9f543e21902beb75f78225fbc9549e353b0e4ea0f7b09bdef196380b8f96dc9ccb671bc04c7826859b5c046ef6 -SHA512 (kernel-abi-stablelists-5.14.0-1.tar.bz2) = 0275111446525d072f53811aa6b67fa47ee4e52cd1f313ab016b66bf41989bec501a1a366c5a8b912acc486139693bba1eeed577de5a491b6f4991474edbb504 -SHA512 (kernel-kabi-dw-5.14.0-1.tar.bz2) = 7ad3645912a36929b068254e4e7b1d21f0b00da2f30cd9be34a7c31ced9888cb5566ee51ad9b610103d6c53c6af96279f0b39d2477acd78be82ac927d110c823 +SHA512 (linux-5.14.0-2.tar.xz) = 7131fe5ba01f7cf1ab7acafbf67619a07bb671f2658ee0b2710343d5aa1779146ecffd405a6cb615cac8c76b343a99b3830f3e71c88850007f8a6c77c2e7ac4f +SHA512 (kernel-abi-stablelists-5.14.0-2.tar.bz2) = f5a3be5ffe5520516d3d5e01ae1d260df5d3bd70b3a635630b0eae4fd43a6f2f27468c8adfc496d587bb7c2a2677d568fc448bdd0e2f790f87f742f67135134f +SHA512 (kernel-kabi-dw-5.14.0-2.tar.bz2) = b0be9497c867edc4834fc6e0291074772ac7f5113cee61d5fc43192fb35fdcacd4db34e92388dc0d6e71d47cd922a09bee7357b6bded8a1aeaa1fddcd9df6cc8