From c1ed550cda2915f0e06f4174b97e3f599f8dd78f Mon Sep 17 00:00:00 2001
From: Akemi Yagi <amyagi@gmail.com>
Date: Sep 20 2019 18:37:03 +0000
Subject: c7 plus kernel: update to 3.10.0-1062.1.2.el7


Signed-off-by: Akemi Yagi <amyagi@gmail.com>

---

diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common
index cf29853..4ee500f 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.1.1
+BUILD:=1062.1.2
 DIST:=.el7
 SPECFILE:=kernel.spec
 RPM:=$(REDHAT)/rpm
diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec
index c3a075b..5ed9d4c 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.1.1.el7
+%define pkgrelease 1062.1.2.el7
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 1062.1.1%{?dist}
+%define specrelease 1062.1.2%{?dist}
 
 %define pkg_release %{specrelease}%{?buildid}
 
@@ -517,9 +517,10 @@ Patch1302: patch-i686-bpf-nojit-v7_7.patch
 Patch1303: patch-i686-no-kaiser_active.patch
 Patch1304: patch-i686-altmap.patch
 Patch1305: patch-cxgb4-tv64-uninit.patch
-Patch1306: patch-md-dax-toiovecend-null.patch
+#Patch1306: patch-md-dax-toiovecend-null.patch
 Patch1307: patch-i686-nfp-2.patch
-Patch1308: patch-i686-v7_7.patch
+#Patch1308: patch-i686-v7_7.patch
+Patch1308: patch-i686-v7_7.2.patch
 
 # end of i686 mods
 
@@ -984,9 +985,10 @@ ApplyOptionalPatch patch-i686-bpf-nojit-v7_7.patch
 ApplyOptionalPatch patch-i686-no-kaiser_active.patch
 ApplyOptionalPatch patch-i686-altmap.patch
 ApplyOptionalPatch patch-cxgb4-tv64-uninit.patch
-ApplyOptionalPatch patch-md-dax-toiovecend-null.patch
+#ApplyOptionalPatch patch-md-dax-toiovecend-null.patch
 ApplyOptionalPatch patch-i686-nfp-2.patch
-ApplyOptionalPatch patch-i686-v7_7.patch
+#ApplyOptionalPatch patch-i686-v7_7.patch
+ApplyOptionalPatch patch-i686-v7_7.2.patch
 %endif
 
 ### plus mod
@@ -2033,7 +2035,7 @@ fi
 %kernel_variant_files %{with_kdump} kdump
 
 %changelog
-* Tue Sep 03 2019 Akemi Yagi <toracat@centos.org> [3.10.0-1062.1.1.el7.centos.plus]
+* Fri Sep 20 2019 Akemi Yagi <toracat@centos.org> [3.10.0-1062.1.2.el7.centos.plus]
 - Apply debranding changes
 - Roll in i686 mods
    addmissing.patch  [puias]
@@ -2088,6 +2090,9 @@ 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]
 
+* Mon Sep 16 2019 Bruno Meneguele <bmeneg@redhat.com> [3.10.0-1062.1.2.el7]
+- [vhost] vhost: make sure log_num < in_num (Eugenio Perez) [1750879 1750880] {CVE-2019-14835}
+
 * Tue Aug 13 2019 Bruno Meneguele <bmeneg@redhat.com> [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]