LU-1120 kernel: kernel update [RHEL6.2 2.6.32-220.4.2]

Update RHEL6.2 kernel to 2.6.32-220.4.2.

Signed-off-by: yang sheng <ys@whamcloud.com>
Change-Id: I08a96bbf2ac3eeaaa9db13998531935a92d85fe7
Reviewed-on: http://review.whamcloud.com/2215
Reviewed-by: Bobi Jam <bobijam@whamcloud.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 5be93a0..4843311 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -2,11 +2,11 @@
        * version 2.1.1
        * Server support for kernels:
          2.6.18-274.18.1.el5 (RHEL5)
-         2.6.32-220.el6 (RHEL6)
+         2.6.32-220.4.2.el6  (RHEL6)
        * Client support for unpatched kernels:
          (see http://wiki.lustre.org/index.php?title=Patchless_Client)
-         2.6.18-274.17.1.el5 (RHEL5)
-         2.6.32-220.el6 (RHEL6)
+         2.6.18-274.18.1.el5 (RHEL5)
+         2.6.32-220.4.2.el6  (RHEL6)
          2.6.29.4-167.fc11  (FC11)
          2.6.16.60-0.69.1 (SLES10)
          2.6.27.19-5      (SLES11)
@@ -18,6 +18,10 @@
          mounted with "32bitapi" mount option
 
 Severity   : enhancement
+Jira       : LU-1120
+Description: Kernel update [RHEL6.2 2.6.32-220.4.2]
+
+Severity   : enhancement
 Jira       : LU-1052
 Description: Kernel update [RHEL5.7 2.6.18-274.18.1.el5]
 

diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in
index c8e9a1e..2aed2cf 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel6.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel6.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.32"
-lnxrel="220.el6"
+lnxrel="220.4.2.el6"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=2.6-rhel6.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 25ffafb..6f5ee59 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -2,10 +2,10 @@ SERIES                VERSION                  COMMENT
 
 SUPPORTED KERNELS:
 2.6-rhel5             RHEL5: 2.6.18-274.18.1.el5
-2.6-rhel6             RHEL6: 2.6.32-220.el6
+2.6-rhel6             RHEL6: 2.6.32-220.4.2.el6
 
 CLIENT SUPPORT FOR UNPATCHED KERNELS:
          2.6.18-274.18.1.el5 (RHEL5)
-         2.6.32-220.el6      (RHEL6)
+         2.6.32-220.4.2.el6  (RHEL6)
          2.6.16.60-0.69.1 (SLES10)
          2.6.27.19-5      (SLES11)