From c1edbeaf7ca3fd10b6f69a79f6ef656bca4aee61 Mon Sep 17 00:00:00 2001 From: Akemi Yagi Date: Oct 07 2020 20:45:29 +0000 Subject: c7 plus kernel: update to 3.10.0-1160.2.1.el7 Signed-off-by: Akemi Yagi --- diff --git a/.kernel.metadata b/.kernel.metadata index 01efbca..f2f69d4 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 -1e61d8af979566805cffa1e46c449ee3e2f2ac79 SOURCES/linux-3.10.0-1160.el7.tar.xz +d3c3e26c3ddaa32253896fe88065486c97143a6d SOURCES/linux-3.10.0-1160.2.1.el7.tar.xz diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index 1ca9ee7..bef0adf 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 +BUILD:=1160.2.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec index a2f3d98..68eb11d 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.el7 +%define pkgrelease 1160.2.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160%{?dist} +%define specrelease 1160.2.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -2097,7 +2097,7 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Thu Oct 01 2020 Akemi Yagi [3.10.0-1160.el7.centos.plus] +* Tue Oct 06 2020 Akemi Yagi [3.10.0-1160.2.1.el7.centos.plus] - Apply debranding changes - Roll in i686 mods addmissing.patch [puias] @@ -2158,6 +2158,19 @@ fi - wireguard added - UEFI disabled in 32-bit kernel +* 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] +- [net] test nouarg before dereferencing zerocopy pointers (Patrick Talbert) [1862273] +- [net] packet: copy user buffers before orphan or clone (Patrick Talbert) [1862273] +- [netdrv] net/mlx5e: Fix deallocation of non-fully init encap entries (Alaa Hleihel) [1874101] +- [netdrv] net/mlx5e: Allow concurrent creation of encap entries (Alaa Hleihel) [1874101] +- [netdrv] net/mlx5e: Protect encap hash table with mutex (Alaa Hleihel) [1874101] + +* Fri Sep 04 2020 Augusto Caringi [3.10.0-1160.1.1.el7] +- [net] netfilter: conntrack: allow sctp hearbeat after connection re-use (Florian Westphal) [1869751] +- [scsi] scsi: ses: don't ask for diagnostic pages repeatedly during probe (Maurizio Lombardi) [1855324] + * Tue Aug 18 2020 Jan Stancek [3.10.0-1160.el7] - [kernel] modsign: Add nomokvarconfig kernel parameter (Lenny Szubowicz) [1867857] - [firmware] modsign: Add support for loading certs from the EFI MOK config table (Lenny Szubowicz) [1867857]