LU-9316 kernel: kernel update RHEL6.9 [2.6.32-696.1.1.el6]

Update RHEL6.9 kernel to 2.6.32-696.1.1.el6

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

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

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 90124db..e9b1f69 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.el6      (RHEL6.9)
+         2.6.32-696.1.1.el6  (RHEL6.9)
          3.10.0-514.16.1.el7 (RHEL7.3)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-97          (SLES11 SP4)
@@ -19,7 +19,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.el6      (RHEL6.9)
+         2.6.32-696.1.1.el6  (RHEL6.9)
          3.10.0-514.16.1.el7 (RHEL7.3)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-97          (SLES11 SP4)

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 83b5b6f..35e75d2 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.el6"
+lnxrel="696.1.1.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 58fbdcc..7ebf851 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.el6      (RHEL 6.9)
+2.6-rhel6.8.series      2.6.32-696.1.1.el6  (RHEL 6.9)
 3.10-rhel7.series       3.10.0-514.16.1.el7 (RHEL 7.3)
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-97          (SLES11 SP4)