Merge "Project import generated by Copybara." into 11.0.8
diff --git a/kernel-source/patches/nfscache.patch b/kernel-source/patches/nfscache.patch
deleted file mode 100644
index bf10568..0000000
--- a/kernel-source/patches/nfscache.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur linux-3.10.0-1160.31.1.el7/net/sunrpc/cache.c linux-3.10.0-1160.31.1.el7.actifio/net/sunrpc/cache.c
---- linux-3.10.0-1160.31.1.el7/net/sunrpc/cache.c 2021-05-26 19:49:38.000000000 +0000
-+++ linux-3.10.0-1160.31.1.el7.actifio/net/sunrpc/cache.c 2021-07-09 20:29:11.674408818 +0000
-@@ -40,6 +40,11 @@
- static bool cache_defer_req(struct cache_req *req, struct cache_head *item);
- static void cache_revisit_request(struct cache_head *item);
- static bool cache_listeners_exist(struct cache_detail *detail);
-+static void cache_fresh_locked(struct cache_head *head, time_t expiry,
-+ struct cache_detail *detail);
-+static void cache_fresh_unlocked(struct cache_head *head,
-+ struct cache_detail *detail);
-+
-
- static void cache_init(struct cache_head *h, struct cache_detail *detail)
- {
-@@ -98,6 +103,7 @@
- *hp = tmp->next;
- tmp->next = NULL;
- detail->entries --;
-+ cache_fresh_locked(tmp, 0, detail);
- freeme = tmp;
- break;
- }
-@@ -114,7 +120,10 @@
- write_unlock(&detail->hash_lock);
-
- if (freeme)
-+ {
-+ cache_fresh_unlocked(freeme, detail);
- cache_put(freeme, detail);
-+ }
- return new;
- }
- EXPORT_SYMBOL_GPL(sunrpc_cache_lookup);
diff --git a/kernel-source/thirdparty/SOURCES/Makefile.common b/kernel-source/thirdparty/SOURCES/Makefile.common
index 75389b1..2b095c4 100644
--- a/kernel-source/thirdparty/SOURCES/Makefile.common
+++ b/kernel-source/thirdparty/SOURCES/Makefile.common
@@ -9,7 +9,7 @@
# marker is git tag which we base off of for exporting patches
MARKER:=v3.10
PREBUILD:=
-BUILD:=1160.92.1
+BUILD:=1160.95.1
DIST:=.el7
SPECFILE:=kernel.spec
RPM:=$(REDHAT)/rpm
diff --git a/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.71.1.el7.tar.xz b/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.71.1.el7.tar.xz
deleted file mode 100644
index aa8d579..0000000
--- a/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.71.1.el7.tar.xz
+++ /dev/null
Binary files differ
diff --git a/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.95.1.el7.tar.xz b/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.95.1.el7.tar.xz
new file mode 100644
index 0000000..25ac57f
--- /dev/null
+++ b/kernel-source/thirdparty/SOURCES/linux-3.10.0-1160.95.1.el7.tar.xz
Binary files differ
diff --git a/kernel-source/thirdparty/SPECS/kernel.spec b/kernel-source/thirdparty/SPECS/kernel.spec
index b6e71a7..843a380 100644
--- a/kernel-source/thirdparty/SPECS/kernel.spec
+++ b/kernel-source/thirdparty/SPECS/kernel.spec
@@ -20,10 +20,10 @@
%global distro_build 1160
%define rpmversion 3.10.0
-%define pkgrelease 1160.92.1.el7
+%define pkgrelease 1160.95.1.el7
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 1160.92.1%{?dist}
+%define specrelease 1160.95.1%{?dist}
%define pkg_release %{specrelease}%{?buildid}
@@ -1810,6 +1810,19 @@
%kernel_variant_files %{with_kdump} kdump
%changelog
+* Fri Jun 23 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.95.1.el7]
+- perf/s390x: Align the register list to what we support (Michael Petlan) [2207745]
+- Revert "[tools] s390/perf: add perf register support for floating-point registers" (Michael Petlan) [2207745]
+- s390/perf: add perf_regs support and user stack dump (Michael Petlan) [2207745]
+- s390/zcrypt: handle new reply code FILTERED_BY_HYPERVISOR (Tobias Huschle) [2212672]
+
+* Fri Jun 09 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.94.1.el7]
+- netfilter: nf_tables: deactivate anonymous set from preparation phase (Florian Westphal) [2196159] {CVE-2023-32233}
+
+* Mon Jun 05 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.93.1.el7]
+- Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu (Wander Lairson Costa) [2152941] {CVE-2022-3564}
+- proc/pagemap: walk page tables under pte lock (Rafael Aquini) [2190338]
+
* Thu May 18 2023 Rado Vrbovsky <rvrbovsk@redhat.com> [3.10.0-1160.92.1.el7]
- packet: fix use-after-free in prb_retire_rx_blk_timer_expired() (Florian Westphal) [2182642]
- x86/bugs: Workaround for incorrectly set X86_BUG_RETBLEED under VMware (Waiman Long) [2189556]
