Branch b1_8

b=18060
i=johann, bobijam

Update kernel for RHEL5 kernel-2.6.18-92.1.22.el5.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 5e8a05c..5e778c0 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -4,7 +4,7 @@ tbd Sun Microsystems, Inc.
         2.6.5-7.314 (SLES 9),
         2.6.9-67.0.22.EL (RHEL 4),
         2.6.16.60-0.31 (SLES 10),
-        2.6.18-92.1.17.el5 (RHEL 5),
+        2.6.18-92.1.22.el5 (RHEL 5),
         2.6.22.14 vanilla (kernel.org)
        * Client support for unpatched kernels:
          (see http://wiki.lustre.org/index.php?title=Patchless_Client)
@@ -31,6 +31,10 @@ tbd Sun Microsystems, Inc.
          of Lustre filesystem with 4K stack may cause a stack overflow. For
          more information, please refer to bugzilla 17630.
 
+Severity   : enhancement
+Bugzilla   : 18060
+Description: Update to RHEL5 kernel-2.6.18-92.1.22.el5.
+
 Severity   : normal
 Frequency  : start MDS on uncleanly shutdowned MDS device
 Bugzilla   : 18049

diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index 660b7a6..18dc724 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="92.1.17.el5"
+lnxrel="92.1.22.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 8b6b6cb..0487527 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -5,7 +5,7 @@ SUPPORTED KERNELS:
 2.6-suse-newer        SLES9: 2.6.5-7.314       extra patches for SLES9 after SP1
 2.6-rhel4             RHEL4: 2.6.9-67.0.22.EL
 2.6-sles10            SLES10: 2.6.16.60-0.31
-2.6-rhel5             RHEL5: 2.6.18-92.1.17.el5
+2.6-rhel5             RHEL5: 2.6.18-92.1.22.el5
 2.6.18-vanilla        kernel.org: 2.6.18.8
 2.6.22-vanilla        kernel.org: 2.6.22.14