From f867598246408c32b23039601306c3c3de023adb Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Tue, 6 Jun 2023 21:36:13 +0800 Subject: [PATCH 1/2] update to kernel-3.10.0-1160.92.1.el7 Signed-off-by: anolis-bot --- Makefile.common | 2 +- dist | 1 + download | 2 +- kernel.spec | 15 +++++++++------ 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 dist diff --git a/Makefile.common b/Makefile.common index 69e7922..75389b1 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 0000000..fc5c65e --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an7 diff --git a/download b/download index 7498439..bce476b 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 3b4e2f3..2509e2a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,10 +1,9 @@ -%define anolis_release .0.1 # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} Summary: The Linux kernel -%define dist .an7 +%define dist .el7 # % define buildid .local @@ -21,10 +20,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%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1805,8 +1804,12 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Mon May 15 2023 yangxianzhao [3.10.0-1160.90.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] -- Gitee From ce6a9de3933e66210d09a40fa8b3e3a0bbc6d1b4 Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Wed, 7 Jun 2023 11:16:25 +0800 Subject: [PATCH 2/2] modified dist --- kernel.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 2509e2a..e4fa856 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,9 +1,10 @@ +%define anolis_release .0.1 # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} Summary: The Linux kernel -%define dist .el7 +%define dist .an7 # % define buildid .local @@ -23,7 +24,7 @@ Summary: The Linux kernel %define pkgrelease 1160.92.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.92.1%{?dist} +%define specrelease 1160.92.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1804,6 +1805,9 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog +* 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] -- Gitee