From: Bob Glossman <bob.glossman@intel.com>
Date: Tue, 6 Mar 2018 22:06:18 +0000 (-0800)
Subject: LU-10783 kernel: kernel update RHEL7.4 [3.10.0-693.21.1.el7]
X-Git-Tag: 2.10.59~2
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=2a5f8ce1a4d46143368d9ec16a8db988f6154e68;ds=sidebyside

LU-10783 kernel: kernel update RHEL7.4 [3.10.0-693.21.1.el7]

update RHEL 7.4 kernel to 3.10.0-693.21.1.el7

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: Ib7d5233d438798e1cdd1c31bb6728f8ea6697959
Reviewed-on: https://review.whamcloud.com/31612
Tested-by: Jenkins
Reviewed-by: Minh Diep <minh.diep@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 496ba27..e70432a 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -8,7 +8,7 @@ TBD Intel Corporation
          2.6.32-573.26.1.el6 (RHEL6.7)
          2.6.32-642.15.1.el6 (RHEL6.8)
          2.6.32-696.18.7.el6 (RHEL6.9)
-         3.10.0-693.17.1.el7 (RHEL7.4)
+         3.10.0-693.21.1.el7 (RHEL7.4)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-107         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
@@ -24,7 +24,7 @@ TBD Intel Corporation
          2.6.32-573.26.1.el6 (RHEL6.7)
          2.6.32-642.15.1.el6 (RHEL6.8)
          2.6.32-696.18.7.el6 (RHEL6.9)
-         3.10.0-693.17.1.el7 (RHEL7.4)
+         3.10.0-693.21.1.el7 (RHEL7.4)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-107         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config
index 6648486..5ddae82 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.10.0-3.10-rhel7-x86_64.config
@@ -387,6 +387,7 @@ CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
+CONFIG_RETPOLINE=y
 CONFIG_INTEL_RDT_A=y
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_NUMACHIP is not set
@@ -1521,6 +1522,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=m
diff --git a/lustre/kernel_patches/targets/3.10-rhel7.target.in b/lustre/kernel_patches/targets/3.10-rhel7.target.in
index cad4821..e6f60f4 100644
--- a/lustre/kernel_patches/targets/3.10-rhel7.target.in
+++ b/lustre/kernel_patches/targets/3.10-rhel7.target.in
@@ -1,5 +1,5 @@
 lnxmaj="3.10.0"
-lnxrel="693.17.1.el7"
+lnxrel="693.21.1.el7"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=3.10-rhel7.series
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 74766ce..e934d43 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -18,7 +18,7 @@ PATCH SERIES FOR SERVER KERNELS:
 2.6-rhel6.series        2.6.32-573.26.1.el6 (RHEL 6.7)
 2.6-rhel6.8.series      2.6.32-642.15.1.el6 (RHEL 6.8)
 2.6-rhel6.8.series      2.6.32-696.18.7.el6 (RHEL 6.9)
-3.10-rhel7.series       3.10.0-693.17.1.el7 (RHEL 7.4)
+3.10-rhel7.series       3.10.0-693.21.1.el7 (RHEL 7.4)
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-107         (SLES11 SP4)
 3.12-sles12.series      3.12.74-60.64.40    (SLES12 SP1)