From 64afd948f5b35a978ca29273f243e2df0bb7dbe2 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Mon, 15 Aug 2022 09:53:26 +0800 Subject: [PATCH 1/2] update to kernel-3.10.0-1160.76.1.el7 Signed-off-by: anolis-bot --- Makefile.common | 2 +- download | 2 +- kernel.spec | 40 ++++++++++++++++++++++++++++++++++------ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Makefile.common b/Makefile.common index b1736bf..ff03054 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.71.1 +BUILD:=1160.76.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/download b/download index a3ffb68..66bc55d 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ dd4c41c2b2b5e2237fa63282e7bbdd7c kernel-abi-whitelists-1160.tar.bz2 85ce224ff3a41d590b5d0a5f7aa08bab kernel-kabi-dw-1160.tar.bz2 -4afd95e312a6d839a596f6cbc7ad2718 linux-3.10.0-1160.71.1.el7.tar.xz +d0056f0af1fd94b2b7124f2f4c9ef1ec linux-3.10.0-1160.76.1.el7.tar.xz diff --git a/kernel.spec b/kernel.spec index 6650015..5cc7823 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2,8 +2,8 @@ %global __spec_install_pre %{___build_pre} Summary: The Linux kernel -%define anolis_release .0.1 -%define dist .an7 + +%define dist .el7 # % define buildid .local @@ -20,10 +20,10 @@ Summary: The Linux kernel %global distro_build 1160 %define rpmversion 3.10.0 -%define pkgrelease 1160.71.1.el7 +%define pkgrelease 1160.76.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.71.1%{anolis_release}%{?dist} +%define specrelease 1160.76.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1804,8 +1804,36 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Fri Aug 12 2022 maqi [3.10.0-1160.71.1.0.1.an7] -- Modified dist +* Tue Jul 26 2022 Rado Vrbovsky [3.10.0-1160.76.1.el7] +- sfc: complete the next packet when we receive a timestamp (Íñigo Huguet) [1793280] + +* Tue Jul 19 2022 Rado Vrbovsky [3.10.0-1160.75.1.el7] +- xfs: fix up non-directory creation in SGID directories (Andrey Albershteyn) [2089360] +- x86/speculation/mmio: Print SMT warning (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- KVM: x86/speculation: Disable Fill buffer clear within guests (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- x86/speculation/mmio: Reuse SRBDS mitigation for SBDS (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- x86/speculation/srbds: Update SRBDS mitigation selection (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- x86/speculation/mmio: Add sysfs reporting for Processor MMIO Stale Data (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- cpu/speculation: Add prototype for cpu_show_srbds() (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- x86/speculation/mmio: Enable CPU Fill buffer clearing on idle (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- x86/bugs: Group MDS, TAA & Processor MMIO Stale Data mitigations (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- x86/speculation/mmio: Add mitigation for Processor MMIO Stale Data (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- x86/speculation: Add a common function for MD_CLEAR mitigation update (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- x86/speculation/mmio: Enumerate Processor MMIO Stale Data bug (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- Documentation: Add documentation for Processor MMIO Stale Data (Rafael Aquini) [2090249] {CVE-2022-21123 CVE-2022-21125 CVE-2022-21166} +- [s390] s390/zcrypt: use kvmalloc instead of kmalloc for 256k alloc (Mete Durlu) [2072970] + +* Wed Jul 13 2022 Rado Vrbovsky [3.10.0-1160.74.1.el7] +- tracing: Fix bad use of igrab in trace_uprobe.c (Oleg Nesterov) [2096884] + +* Thu Jul 07 2022 Rado Vrbovsky [3.10.0-1160.73.1.el7] +- qede: Reduce verbosity of ptp tx timestamp (Manish Chopra) [2080646] +- RDMA/cma: Fix unbalanced cm_id reference count during address resolve (Kamal Heib) [2085425] + +* Tue Jun 28 2022 Rado Vrbovsky [3.10.0-1160.72.1.el7] +- sched,perf: Fix periodic timers (Valentin Schneider) [2077346] +- sched: debug: Remove the cfs bandwidth timer_active printout (Valentin Schneider) [2077346] +- sched: Cleanup bandwidth timers (Valentin Schneider) [2077346] * Wed Jun 15 2022 Rado Vrbovsky [3.10.0-1160.71.1.el7] - netfilter: nf_tables: disallow non-stateful expression in sets earlier (Phil Sutter) [2093000] {CVE-2022-1966} -- Gitee From 21406bce0fc13063951ee54022976dc54086384f Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Fri, 12 Aug 2022 13:39:06 +0800 Subject: [PATCH 2/2] Modified dist for anolis Signed-off-by: yangxianzhao --- kernel.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel.spec b/kernel.spec index 5cc7823..2dd1df7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2,8 +2,8 @@ %global __spec_install_pre %{___build_pre} Summary: The Linux kernel - -%define dist .el7 +%define anolis_release .0.1 +%define dist .an7 # % define buildid .local @@ -23,7 +23,7 @@ Summary: The Linux kernel %define pkgrelease 1160.76.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.76.1%{?dist} +%define specrelease 1160.76.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -1804,6 +1804,10 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog +* Thu Aug 25 2022 maqi [3.10.0-1160.76.1.0.1.an7] +- Modified dist +- Cherry-pick [21940b3] + * Tue Jul 26 2022 Rado Vrbovsky [3.10.0-1160.76.1.el7] - sfc: complete the next packet when we receive a timestamp (Íñigo Huguet) [1793280] -- Gitee