Branch b1_6

b=16633
i=shadow, bobijam

Update to RHEL5 kernel-2.6.18-92.1.10.el5.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index b394afc..3214175 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -4,7 +4,7 @@ tbd Sun Microsystems, Inc.
         2.6.5-7.312 (SLES 9),
         2.6.9-67.0.22.EL (RHEL 4),
         2.6.16.60-0.27 (SLES 10),
-        2.6.18-92.1.6.el5 (RHEL 5),
+        2.6.18-92.1.10.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)
@@ -39,6 +39,10 @@ tbd Sun Microsystems, Inc.
          old (verbose) output can be obtained by using -v option.
 
 Severity   : enhancement
+Bugzilla   : 16633
+Description: Update to RHEL5 kernel-2.6.18-92.1.10.el5.
+
+Severity   : enhancement
 Bugzilla   : 16547
 Description: Update to SLES10 SP2 kernel-2.6.16.60-0.27.
 

diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index d0cdeec..5d208f5 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.6.el5"
+lnxrel="92.1.10.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 2886a29..29bf73b 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.312       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.27
-2.6-rhel5             RHEL5: 2.6.18-92.1.6.el5
+2.6-rhel5             RHEL5: 2.6.18-92.1.10.el5
 2.6.18-vanilla        kernel.org: 2.6.18.8
 2.6.22-vanilla        kernel.org: 2.6.22.14