Branch HEAD

b=16633
i=shadow, zhenyu.xu

Update to RHEL5 kernel-2.6.18-92.1.10.el5.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 3b72698..513d323 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -2,7 +2,7 @@ tbd  Sun Microsystems, Inc.
        * version 2.0.0
        * Support for kernels:
         2.6.16.60-0.27 (SLES 10),
        * version 2.0.0
        * Support for kernels:
         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)
         2.6.22.14 vanilla (kernel.org).
        * Client support for unpatched kernels:
         (see http://wiki.lustre.org/index.php?title=Patchless_Client)


@@ -13,6 +13,10 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
 
 Severity   : enhancement
         removed cwd "./" (refer to Bugzilla 14399).
 
 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.
 
 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"
 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
 
 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 46ee096..eb8e804 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -3,7 +3,7 @@ SERIES                VERSION                  COMMENT
 SUPPORTED KERNELS:
 2.6-rhel4             RHEL4: 2.6.9-67.0.20.EL
 2.6-sles10            SLES10: 2.6.16.60-0.27
 SUPPORTED KERNELS:
 2.6-rhel4             RHEL4: 2.6.9-67.0.20.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
 
 2.6.18-vanilla        kernel.org: 2.6.18.8
 2.6.22-vanilla        kernel.org: 2.6.22.14