Branch b1_6

b=15152
i=shadow
i=johann

Update kernel to RHEL5.1 2.6.18-53.1.14.el5.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 4e39246..c9dd448 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -6,6 +6,7 @@ tbd  Sun Microsystems, Inc.
         2.6.16.54-0.2.5 (SLES 10),
         2.6.18-53.1.13.el5 (RHEL 5),
         2.6.18.8 vanilla (kernel.org)
+        2.6.22.14 vanilla (kernel.org)
        * Client support for unpatched kernels:
         (see http://wiki.lustre.org/index.php?title=Patchless_Client)
         2.6.16 - 2.6.22 vanilla (kernel.org)
@@ -17,6 +18,10 @@ tbd  Sun Microsystems, Inc.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         removed cwd "./" (refer to Bugzilla 14399).
 
+Severity   : enhancement
+Bugzilla   : 15152
+Description: Update kernel to RHEL5 2.6.18-53.1.14.el5.
+
 Severity   : major
 Frequency  : frequent on X2 node
 Bugzilla   : 15010

diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index cd83ec4..6c39710 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel5.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.18"
-lnxrel="53.1.13.el5"
+lnxrel="53.1.14.el5"
 
 KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=2.6-rhel5.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index d505ec4..53a047e 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -5,8 +5,9 @@ SUPPORTED KERNELS:
 2.6-suse-newer        SLES9: 2.6.5-7.308       extra patches for SLES9 after SP1
 2.6-rhel4             RHEL4: 2.6.9-67.0.4.EL
 2.6-sles10            SLES10: 2.6.16.54-0.2.5
-2.6-rhel5             RHEL5: 2.6.18-53.1.13.el5
-2.6.18-vanilla.series kernel.org: 2.6.18.8
+2.6-rhel5             RHEL5: 2.6.18-53.1.14.el5
+2.6.18-vanilla        kernel.org: 2.6.18.8
+2.6.22-vanilla        kernel.org: 2.6.22.14
 
 CLIENT SUPPORT FOR UNPATCHED KERNELS:
                    kernel.org 2.6.16-2.6.19