diff --git a/Makefile.common b/Makefile.common index f7acf4f40587fa1901717dafca3af9e0c1038f51..1d6d77304ec599abcfa4bfe71f60c5e1a2eae6d2 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 b7696310e817b74e9dfb7e749500997b80d2f3db..985f8ca9d50cc1dc85785c3278f96a5c1a44e37c 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 1cd8a5a3bb90b49cb05bb71859ba649de622e2c3..266ded2e93f50e4bcc9ea66a631ec93b9001c33e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,9 +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 anolis_release .0.1 %define dist .an7 # % define buildid .local @@ -21,10 +21,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%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1805,8 +1805,13 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Fri Nov 04 2022 yangxianzhao [3.10.0-1160.80.1.0.1.an7] -- Modified dist +* 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] +- [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]