Branch HEAD

b=17458
i=shadow, bobijam

Update kernel to SLES10 SP2 2.6.16.60-0.31.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c7d0d77..6a4513f 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,7 +1,7 @@
 tbd  Sun Microsystems, Inc.
        * version 2.0.0
        * Support for kernels:
-        2.6.16.60-0.27 (SLES 10),
+        2.6.16.60-0.31 (SLES 10),
         2.6.18-92.1.10.el5 (RHEL 5),
         2.6.22.14 vanilla (kernel.org).
        * Client support for unpatched kernels:
@@ -12,6 +12,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).
        * File join has been disabled in this release, refer to Bugzilla 16929.
+ 
+Severity   : enhancement
+Bugzilla   : 17458
+Description: Update to SLES10 SP2 kernel-2.6.16.60-0.31.
 
 Severity   : enhancement
 Bugzilla   : 14166

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index 42ef94c..bfa8365 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-sles10.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles10.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.16"
-lnxrel="60-0.27"
+lnxrel="60-0.31"
 
 # this is the delimeter that goes between $lnxmaj and $lnxrel
 # defaults to "-"

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index eb8e804..0ad8b15 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -2,7 +2,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
+2.6-sles10            SLES10: 2.6.16.60-0.31
 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