diff --git a/Makefile.common b/Makefile.common index 69e7922449ddfc71fb3a80b8803f0df26075cded..75389b1d3ad5ca34de25caae7a9506ed944bce32 100644 --- a/Makefile.common +++ b/Makefile.common @@ -9,7 +9,7 @@ RPMVERSION:=3.10.0 # marker is git tag which we base off of for exporting patches MARKER:=v3.10 PREBUILD:= -BUILD:=1160.90.1 +BUILD:=1160.92.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..fc5c65ee18de0a0c321f8fc7f14f732699c9413f --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an7 diff --git a/download b/download index 74984394535041825277682584d14003306faa21..bce476b791905d4b63d84edd9c0ebaaa495edf7d 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ dd4c41c2b2b5e2237fa63282e7bbdd7c kernel-abi-whitelists-1160.tar.bz2 85ce224ff3a41d590b5d0a5f7aa08bab kernel-kabi-dw-1160.tar.bz2 -bf9fcc79ef24d9bec5e10cb702de9944 linux-3.10.0-1160.90.1.el7.tar.xz +9c36e4fe91567e8c726ef9a648661b4d linux-3.10.0-1160.92.1.el7.tar.xz diff --git a/kernel.spec b/kernel.spec index 3b4e2f38f310b77548d47590c2dc86a9fd6f4357..e4fa856cfda3e788c8cb1c8b6d6828ebf8ca8e95 100644 --- a/kernel.spec +++ b/kernel.spec @@ -21,10 +21,10 @@ Summary: The Linux kernel %global distro_build 1160 %define rpmversion 3.10.0 -%define pkgrelease 1160.90.1.el7 +%define pkgrelease 1160.92.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.90.1%{anolis_release}%{?dist} +%define specrelease 1160.92.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1805,9 +1805,16 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Mon May 15 2023 yangxianzhao [3.10.0-1160.90.1.0.1.an7] +* Wed Jun 07 2023 yangxianzhao [3.10.0-1160.92.1.0.1.an7] - spec: modified dist +* Thu May 18 2023 Rado Vrbovsky [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] + +* Fri Apr 21 2023 Rado Vrbovsky [3.10.0-1160.91.1.el7] +- target: iscsi: use GFP_NOIO with loopback connections (Maurizio Lombardi) [2181931] + * Fri Mar 17 2023 Rado Vrbovsky [3.10.0-1160.90.1.el7] - NFSv4.1: Fix open stateid recovery (Benjamin Coddington) [2156890] - NFS: Don't open code clearing of delegation state (Benjamin Coddington) [2156890]