LU-10456 kernel: kernel update RHEL6.9 [2.6.32-696.18.7.el6]

Update RHEL6.9 kernel to 2.6.32-696.18.7.el6

Test-Parameters: clientdistro=el6.9 mdsdistro=el6.9 \
  ossdistro=el6.9 mdtfilesystemtype=ldiskfs \
  ostfilesystemtype=ldiskfs testgroup=review-ldiskfs

Change-Id: Ib0b7d5ff7f50f96c8bbc064541ae5c8bf2a4367f
Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-on: https://review.whamcloud.com/30736
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index f4426a1..53948a2 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -7,7 +7,7 @@ TBD Intel Corporation
          2.6.32-504.30.3.el6 (RHEL6.6)
          2.6.32-573.26.1.el6 (RHEL6.7)
          2.6.32-642.15.1.el6 (RHEL6.8)
-         2.6.32-696.16.1.el6 (RHEL6.9)
+         2.6.32-696.18.7.el6 (RHEL6.9)
          3.10.0-693.11.6.el7 (RHEL7.4)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-107         (SLES11 SP4)
@@ -20,7 +20,7 @@ TBD Intel Corporation
          2.6.32-504.30.3.el6 (RHEL6.6)
          2.6.32-573.26.1.el6 (RHEL6.7)
          2.6.32-642.15.1.el6 (RHEL6.8)
-         2.6.32-696.16.1.el6 (RHEL6.9)
+         2.6.32-696.18.7.el6 (RHEL6.9)
          3.10.0-693.11.6.el7 (RHEL7.4)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-107         (SLES11 SP4)

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config
index e79574b..0d89dc5 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6.9-x86_64.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Tue May 30 08:32:41 2017
+# Thu Jan  4 08:24:47 2018
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -4513,12 +4513,15 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_KAISER=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_PATH is not set
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_INTEL_TXT=y
 CONFIG_LSM_MMAP_MIN_ADDR=65535
+CONFIG_SPEC_CTRL=y
+CONFIG_ARCH_SPEC_CTRL=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1

diff --git a/lustre/kernel_patches/targets/2.6-rhel6.9.target.in b/lustre/kernel_patches/targets/2.6-rhel6.9.target.in
index f2f9b6a..86497ae 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel6.9.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel6.9.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.32"
-lnxrel="696.16.1.el6"
+lnxrel="696.18.7.el6"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=2.6-rhel6.8.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index df5ad57..6f7a64a 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -17,7 +17,7 @@ PATCH SERIES FOR SERVER KERNELS:
 2.6-rhel6.series        2.6.32-504.30.3.el6 (RHEL 6.6)
 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.16.1.el6 (RHEL 6.9)
+2.6-rhel6.8.series      2.6.32-696.18.7.el6 (RHEL 6.9)
 3.10-rhel7.series       3.10.0-693.11.6.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)