From aa56cc1bc947538bb606345e267ff6327a366ce4 Mon Sep 17 00:00:00 2001 From: Akemi Yagi Date: Nov 13 2019 20:45:34 +0000 Subject: c7 plus kernel: update to 3.10.0-1062.4.3.el7 Signed-off-by: Akemi Yagi --- diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index 2051ee3..fc20ba2 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.4.2 +BUILD:=1062.4.3 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec index 0800406..e846417 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.4.2.el7 +%define pkgrelease 1062.4.3.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1062.4.2%{?dist} +%define specrelease 1062.4.3%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -491,7 +491,8 @@ Patch1019: patch-spec_ctrl_i686_v3_8_0.patch # Patch1020: patch-i686-fpu-issues-v4-7_5.patch # Patch1020: patch-i686-fpu-issues-v4-8_0.patch # Patch1020: patch-i686-fpu-issues-v4-8_0-v7_7.patch -Patch1020: patch-i686-fpu-issues-v4-8_0-v7_7-v2.patch +# Patch1020: patch-i686-fpu-issues-v4-8_0-v7_7-v2.patch +Patch1020: patch-i686-fpu-issues-v4-8_0-v7_7-v3.patch Patch1021: i386-retpoline-support-v6.patch Patch1101: patch-ALIGN-dupdef.patch @@ -963,7 +964,8 @@ ApplyOptionalPatch patch-spec_ctrl_i686_v3_8_0.patch # ApplyOptionalPatch patch-i686-fpu-issues-v4-7_5.patch # ApplyOptionalPatch patch-i686-fpu-issues-v4-8_0.patch # ApplyOptionalPatch patch-i686-fpu-issues-v4-8_0-v7_7.patch -ApplyOptionalPatch patch-i686-fpu-issues-v4-8_0-v7_7-v2.patch +# ApplyOptionalPatch patch-i686-fpu-issues-v4-8_0-v7_7-v2.patch +ApplyOptionalPatch patch-i686-fpu-issues-v4-8_0-v7_7-v3.patch ApplyOptionalPatch i386-retpoline-support-v6.patch ApplyOptionalPatch patch-ALIGN-dupdef.patch @@ -2041,7 +2043,7 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Tue Nov 12 2019 Akemi Yagi [3.10.0-1062.4.2.el7.centos.plus] +* Wed Nov 13 2019 Akemi Yagi [3.10.0-1062.4.3.el7.centos.plus] - Apply debranding changes - Roll in i686 mods addmissing.patch [puias] @@ -2098,6 +2100,9 @@ fi - Apply a patch for acpi issue [bug#16315] - Apply a patch to fix ICMP redirects [bug#16521] +* Tue Nov 12 2019 Bruno Meneguele [3.10.0-1062.4.3.el7] +- [drm] drm/i915/cmdparser: Fix jump whitelist clearing (Dave Airlie) [1756882 1756883] {CVE-2019-0155} + * Tue Nov 05 2019 Bruno Meneguele [3.10.0-1062.4.2.el7] - [drm] drm/i915: Lower RM timeout to avoid DSI hard hangs (Dave Airlie) [1756815 1756816] {CVE-2019-0154} - [drm] drm/i915/gen8+: Add RC6 CTX corruption WA (Dave Airlie) [1756815 1756816] {CVE-2019-0154}