From 68beebcb0d92747abb659402e139694222d18daf Mon Sep 17 00:00:00 2001 From: Akemi Yagi Date: Sep 03 2019 18:50:07 +0000 Subject: c7 plus kernel: update to 3.10.0-1062.1.1.el7 Signed-off-by: Akemi Yagi --- diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index a275d8f..cf29853 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:=1062 +BUILD:=1062.1.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec index 57c7b13..c3a075b 100644 --- a/SPECS/kernel-plus.spec +++ b/SPECS/kernel-plus.spec @@ -14,10 +14,10 @@ Summary: The Linux kernel %global distro_build 1062 %define rpmversion 3.10.0 -%define pkgrelease 1062.el7 +%define pkgrelease 1062.1.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1062%{?dist} +%define specrelease 1062.1.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -29,6 +29,7 @@ Summary: The Linux kernel # All should default to 1 (enabled) and be flipped to 0 (disabled) # by later arch-specific checks. +%define _with_kabidupchk 1 # The following build options are enabled by default. # Use either --without in your rpmbuild command or force values # to 0 in here to disable them. @@ -2032,7 +2033,7 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Thu Aug 08 2019 Akemi Yagi [3.10.0-1062.el7.centos.plus] +* Tue Sep 03 2019 Akemi Yagi [3.10.0-1062.1.1.el7.centos.plus] - Apply debranding changes - Roll in i686 mods addmissing.patch [puias] @@ -2087,6 +2088,25 @@ fi - Enable NIU and add a patch that fixes build errors submitted by h-masuda [bug#15040] - Apply a patch for acpi issue [bug#16315] +* Tue Aug 13 2019 Bruno Meneguele [3.10.0-1062.1.1.el7] +- [fs] nfsv4.1: Avoid false retries when RPC calls are interrupted (Benjamin Coddington) [1739077 1732427] +- [fs] NFS4.1 handle interrupted slot reuse from ERR_DELAY (Benjamin Coddington) [1739077 1732427] +- [fs] nfsv4.1: Fix the client behaviour on NFS4ERR_SEQ_FALSE_RETRY (Benjamin Coddington) [1739077 1732427] +- [fs] cifs: fix panic in smb2_reconnect (Leif Sahlberg) [1737382 1702264] +- [scsi] sg: protect against races between mmap() and SG_SET_RESERVED_SIZE (Ewan Milne) [1737380 1710533] +- [scsi] sg: recheck MMAP_IO request length with lock held (Ewan Milne) [1737380 1710533] +- [scsi] sg: reset 'res_in_use' after unlinking reserved array (Ewan Milne) [1737380 1710533] +- [scsi] sg: protect accesses to 'reserved' page array (Ewan Milne) [1737380 1710533] +- [netdrv] mlx4/en_netdev: allow offloading VXLAN over VLAN (Paolo Abeni) [1734333 1733671] +- [netdrv] brcmfmac: assure SSID length from firmware is limited (Stanislaw Gruszka) [1704879 1704880] {CVE-2019-9500} +- [net] tcp: be more careful in tcp_fragment() (Marcelo Leitner) [1739130 1732106] +- [documentation] Documentation: Add swapgs description to the Spectre v1 documentation (Waiman Long) [1729810 1724510] {CVE-2019-1125} +- [documentation] Documentation: Add section about CPU vulnerabilities for Spectre (Waiman Long) [1729810 1724510] {CVE-2019-1125} +- [x86] x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS (Waiman Long) [1729810 1724510] {CVE-2019-1125} +- [x86] x86/speculation: Enable Spectre v1 swapgs mitigations (Waiman Long) [1729810 1724510] {CVE-2019-1125} +- [x86] x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations (Waiman Long) [1729810 1724510] {CVE-2019-1125} +- [x86] x86/feature: Relocate X86_FEATURE_INVPCID_SINGLE (Waiman Long) [1729810 1724510] {CVE-2019-1125} + * Thu Jul 18 2019 Bruno E. O. Meneguele [3.10.0-1062.el7] - [fs] revert "xfs: disable copy_file_range() to avoid broken splice copy" (Eric Sandeen) [1731205]