From 15a892ca411732f422f5b48ce6c987f59b14209d Mon Sep 17 00:00:00 2001 From: Akemi Yagi Date: Oct 19 2020 21:07:26 +0000 Subject: c7 plus kernel: update to 3.10.0-1160.2.2.el7 Signed-off-by: Akemi Yagi --- diff --git a/.kernel.metadata b/.kernel.metadata index f2f69d4..5ba39cd 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,3 +1,3 @@ ba5599148e52ecd126ebcf873672e26d3288323e SOURCES/kernel-abi-whitelists-1160.tar.bz2 5000b85c42ef87b6835dd8eef063e4623c2e0fa9 SOURCES/kernel-kabi-dw-1160.tar.bz2 -d3c3e26c3ddaa32253896fe88065486c97143a6d SOURCES/linux-3.10.0-1160.2.1.el7.tar.xz +02266f26e378aeabc2641fe07ced7a328e08612e SOURCES/linux-3.10.0-1160.2.2.el7.tar.xz diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index bef0adf..4fd4035 100644 --- a/SOURCES/Makefile.common +++ b/SOURCES/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.2.1 +BUILD:=1160.2.2 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec index 501bf8a..d9310ef 100644 --- a/SPECS/kernel-plus.spec +++ b/SPECS/kernel-plus.spec @@ -20,10 +20,10 @@ Summary: The Linux kernel %global distro_build 1160 %define rpmversion 3.10.0 -%define pkgrelease 1160.2.1.el7 +%define pkgrelease 1160.2.2.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.2.1%{?dist} +%define specrelease 1160.2.2%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -2097,7 +2097,7 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Tue Oct 06 2020 Akemi Yagi [3.10.0-1160.2.1.el7.centos.plus] +* Mon Oct 19 2020 Akemi Yagi [3.10.0-1160.2.2.el7.centos.plus] - Apply debranding changes - Roll in i686 mods addmissing.patch [puias] @@ -2158,6 +2158,10 @@ fi - wireguard added - UEFI disabled in 32-bit kernel +* Sat Oct 17 2020 Augusto Caringi [3.10.0-1160.2.2.el7] +- [net] bluetooth: l2cap: Fix calling sk_filter on non-socket based channel (Gopal Tiwari) [1888253] {CVE-2020-12351} +- [net] bluetooth: a2mp: Fix not initializing all members (Gopal Tiwari) [1888797] {CVE-2020-12352} + * Mon Sep 21 2020 Augusto Caringi [3.10.0-1160.2.1.el7] - [edac] EDAC/i10nm: Update driver to support different bus number config register offsets (Aristeu Rozanski) [1840276] - [edac] EDAC, {skx, i10nm}: Make some configurations CPU model specific (Aristeu Rozanski) [1840276]