From ed71b5d75ef9c395a0cc489f4ed3fee23bb6180c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 15 2021 09:59:06 +0000
Subject: import kernel-4.18.0-348.2.1.el8_5


---

diff --git a/.gitignore b/.gitignore
index 575eaf5..7901f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 SOURCES/kernel-abi-stablelists-4.18.0-348.tar.bz2
 SOURCES/kernel-kabi-dw-4.18.0-348.tar.bz2
-SOURCES/linux-4.18.0-348.el8.tar.xz
+SOURCES/linux-4.18.0-348.2.1.el8_5.tar.xz
 SOURCES/rheldup3.x509
 SOURCES/rhelkpatch1.x509
diff --git a/.kernel.metadata b/.kernel.metadata
index 91bc8e4..92ebe83 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,5 +1,5 @@
 2d622b532a9ac503406373ef5fa5bea1192086d1 SOURCES/kernel-abi-stablelists-4.18.0-348.tar.bz2
 109f15ce9699bfa93bd9dc4f8e88013ce341e0e7 SOURCES/kernel-kabi-dw-4.18.0-348.tar.bz2
-4606b8a56f6595b60be39ba78c1e3029aa82667c SOURCES/linux-4.18.0-348.el8.tar.xz
+2882ede4bb8b5920774098d55209cd4b56fedddc SOURCES/linux-4.18.0-348.2.1.el8_5.tar.xz
 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 3a4cbb1..2f749b3 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -42,10 +42,10 @@
 # define buildid .local
 
 %define rpmversion 4.18.0
-%define pkgrelease 348.el8
+%define pkgrelease 348.2.1.el8_5
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 348%{?dist}
+%define specrelease 348.2.1%{?dist}
 
 %define pkg_release %{specrelease}%{?buildid}
 
@@ -57,6 +57,7 @@
 # architecture allows it. All should default to 1 (enabled) and be flipped to
 # 0 (disabled) by later arch-specific checks.
 
+%define _with_kabidupchk 1
 # The following build options are enabled by default.
 # Use either --without <opt> in your rpmbuild command or force values
 # to 0 in here to disable them.
@@ -2628,8 +2629,18 @@ fi
 #
 #
 %changelog
-* Tue Nov 09 2021 CentOS Sources <bugs@centos.org> - 4.18.0-348.el8.centos
-- Apply debranding changes
+* Mon Nov 08 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.2.1.el8_5]
+- tipc: fix size validations for the MSG_CRYPTO type (Bruno Meneguele) [2020506 2020507] {CVE-2021-43267}
+- net: Fix skb->csum update in inet_proto_csum_replace16(). (Balazs Nemeth) [2005981 1975193]
+
+* Wed Nov 03 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.1.1.el8_5]
+- lib/timerqueue: Rely on rbtree semantics for next timer (Phil Auld) [2014677 2007099] {CVE-2021-20317}
+- mm/hmm: make HMM_MIRROR an implicit option (Rafael Aquini) [2017519 1998534]
+- mm/hmm: allow HMM_MIRROR on all architectures with MMU (Rafael Aquini) [2017519 1998534]
+- mm: don't select MIGRATE_VMA_HELPER from HMM_MIRROR (Rafael Aquini) [2017519 1998534]
+- mm: sort out the DEVICE_PRIVATE Kconfig mess (Rafael Aquini) [2017519 1998534]
+- ceph: skip existing superblocks that are blocklisted or shut down when mounting (Jeffrey Layton) [2017071 2011462]
+- redhat: switch release to zstream (Bruno Meneguele)
 
 * Mon Oct 04 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.el8]
 - drm/nouveau/fifo/ga102: initialise chid on return from channel creation (Ben Skeggs) [1997878]