From e45021066da2447f1a4af1eda85624e876a65310 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Wed, 14 Dec 2022 11:41:49 +0800 Subject: [PATCH 1/2] update to kernel-3.10.0-1160.81.1.el7 Signed-off-by: anolis-bot --- Makefile.common | 2 +- download | 2 +- kernel.spec | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile.common b/Makefile.common index f7acf4f..1d6d773 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.80.1 +BUILD:=1160.81.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/download b/download index b769631..985f8ca 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ dd4c41c2b2b5e2237fa63282e7bbdd7c kernel-abi-whitelists-1160.tar.bz2 85ce224ff3a41d590b5d0a5f7aa08bab kernel-kabi-dw-1160.tar.bz2 -45af58f50f5cc081c6d4ff35844232bb linux-3.10.0-1160.80.1.el7.tar.xz +b4a34d5cc1c3461d940459f8047cf4f2 linux-3.10.0-1160.81.1.el7.tar.xz diff --git a/kernel.spec b/kernel.spec index 1cd8a5a..aa787d4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -3,8 +3,7 @@ Summary: The Linux kernel -%define anolis_release .0.1 -%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.80.1.el7 +%define pkgrelease 1160.81.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.80.1%{anolis_release}%{?dist} +%define specrelease 1160.81.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1805,8 +1804,10 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Fri Nov 04 2022 yangxianzhao [3.10.0-1160.80.1.0.1.an7] -- Modified dist +* Thu Nov 24 2022 Rado Vrbovsky [3.10.0-1160.81.1.el7] +- [netdrv] bnxt: don't lock the tx queue from napi poll (Jamie Bainbridge) [2110869] +- [netdrv] bnxt_en: reverse order of TX disable and carrier off (Jamie Bainbridge) [2110869] +- [netdrv] qede: confirm skb is allocated before using (Jamie Bainbridge) [2131145] * Sat Oct 08 2022 Rado Vrbovsky [3.10.0-1160.80.1.el7] - scsi: lpfc: Fix FCP I/O flush functionality for TMF routines (Dick Kennedy) [1969988] -- Gitee From 28a7b9a1ffa6b0e6ff8dea8298f7ab4aa4f2facb Mon Sep 17 00:00:00 2001 From: pangqing Date: Wed, 14 Dec 2022 16:32:48 +0800 Subject: [PATCH 2/2] spec: modified dist Signed-off-by: pangqing --- kernel.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index aa787d4..266ded2 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.81.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.81.1%{?dist} +%define specrelease 1160.81.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1804,6 +1805,9 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog +* Wed Dec 14 2022 yangxianzhao [3.10.0-1160.81.1.0.1.an7] +- spec: modified dist + * Thu Nov 24 2022 Rado Vrbovsky [3.10.0-1160.81.1.el7] - [netdrv] bnxt: don't lock the tx queue from napi poll (Jamie Bainbridge) [2110869] - [netdrv] bnxt_en: reverse order of TX disable and carrier off (Jamie Bainbridge) [2110869] -- Gitee