From 5cda8c1735f42a03519f808d31324fe1c124dc00 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Thu, 4 Nov 2021 17:29:52 +0000
Subject: [PATCH] kernel-5.14.0-12.el9

* Thu Nov 04 2021 Jarod Wilson <jarod@redhat.com> [5.14.0-12.el9]
- redhat: make dist-srpm-gcov add to BUILDOPTS (Jan Stancek) [2017628]
- redhat: Fix dist-srpm-gcov (Jan Stancek) [2017628]
- s390: report more CPU capabilities (Robin Dapp) [2012095]
- s390/disassembler: add instructions (Robin Dapp) [2012095]
- audit: move put_tree() to avoid trim_trees refcount underflow and UAF (Richard Guy Briggs) [1985904]
- libbpf: Properly ignore STT_SECTION symbols in legacy map definitions (Jiri Olsa) [1998266]
- libbpf: Ignore STT_SECTION symbols in 'maps' section (Jiri Olsa) [1998266]
- selftests, bpf: test_lwt_ip_encap: Really disable rp_filter (Jiri Benc) [2006328]
Resolves: rhbz#1985904, rhbz#1998266, rhbz#2006328, rhbz#2012095, rhbz#2017628

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 Makefile.rhelver |  2 +-
 kernel.spec      | 22 ++++++++++++++++------
 sources          |  6 +++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 02ecedb89..baa53733f 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 = 11
+RHEL_RELEASE = 12
 
 #
 # Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 6e1ebde3e..90190abe6 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 11
+%global distro_build 12
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -129,13 +129,13 @@ Summary: The Linux kernel
 %define kversion 5.14
 
 %define rpmversion 5.14.0
-%define pkgrelease 11.el9
+%define pkgrelease 12.el9
 
 # This is needed to do merge window version magic
 %define patchlevel 14
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 11%{?buildid}%{?dist}
+%define specrelease 12%{?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-11.el9.tar.xz
+Source0: linux-5.14.0-12.el9.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1360,8 +1360,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.14.0-11.el9 -c
-mv linux-5.14.0-11.el9 linux-%{KVERREL}
+%setup -q -n kernel-5.14.0-12.el9 -c
+mv linux-5.14.0-12.el9 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2952,6 +2952,16 @@ fi
 #
 #
 %changelog
+* Thu Nov 04 2021 Jarod Wilson <jarod@redhat.com> [5.14.0-12.el9]
+- redhat: make dist-srpm-gcov add to BUILDOPTS (Jan Stancek) [2017628]
+- redhat: Fix dist-srpm-gcov (Jan Stancek) [2017628]
+- s390: report more CPU capabilities (Robin Dapp) [2012095]
+- s390/disassembler: add instructions (Robin Dapp) [2012095]
+- audit: move put_tree() to avoid trim_trees refcount underflow and UAF (Richard Guy Briggs) [1985904]
+- libbpf: Properly ignore STT_SECTION symbols in legacy map definitions (Jiri Olsa) [1998266]
+- libbpf: Ignore STT_SECTION symbols in 'maps' section (Jiri Olsa) [1998266]
+- selftests, bpf: test_lwt_ip_encap: Really disable rp_filter (Jiri Benc) [2006328]
+
 * Thu Oct 28 2021 Herton R. Krzesinski <herton@redhat.com> [5.14.0-11.el9]
 - selinux: remove the SELinux lockdown implementation (Ondrej Mosnacek) [1940843 1945581]
 - bpf: Fix integer overflow in prealloc_elems_and_freelist() (Yauheni Kaliuta) [2010494] {CVE-2021-41864}
diff --git a/sources b/sources
index f749bab9b..0bc71e126 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.0-11.el9.tar.xz) = 069771dafadf06ca0e9bbccadfc383e6089e095cfbddf334f30cfadc246656fdebc1cb8166ee1aef18c638fa3fea95d82d55a7e93e7ade395c786b94fb008eec
-SHA512 (kernel-abi-stablelists-5.14.0-11.tar.bz2) = 03e4f63aa1923e9e089ebd8902bf57666a8d5629621d050886d61dc4b319b6b46df32f73f9a37b06a67d3eb4784169af1ba11f212299cde2fa153b6354bc87c5
-SHA512 (kernel-kabi-dw-5.14.0-11.tar.bz2) = 9cbbf1b1c46550108d177297d884fb5978ce86a6e59be990a7391ec1ddd9c8a867cfa5a060e0ae883c74f477cdd678f2f199fc4040d9074c332ded2657898b90
+SHA512 (linux-5.14.0-12.el9.tar.xz) = 52e8e834da088a1b3e8e824aad15b7e0701f7b52d47bf88efdb1f2e6e5d908a5005f832cb6800aacbe522616eda923f87d0bbee93b028ae3cb48c663b92f235b
+SHA512 (kernel-abi-stablelists-5.14.0-12.tar.bz2) = 5cdfad8d85896514cc87cfd0d3f3c69eef94c3be7c2956194b41a2d925b436af8822477bd3357a698849ff0506c72731e88efb35be904e177e6614ca58ed4915
+SHA512 (kernel-kabi-dw-5.14.0-12.tar.bz2) = edc5f493a7cf5737ea6e9c643b50393500ec47cd88d84d9c933e03914201d35e7f03e7a7b5a0165bf1fd3eab26c5da2cd1e50115f000cd9273c7e98f6ce0959e