Branch HEAD

b=18061
i=johann, bobijam

Update kernel for SLES10 kernel-2.6.16.60-0.33.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 3fddadf..48d2398 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.31 (SLES 10),
+        2.6.16.60-0.33 (SLES 10),
         2.6.18-92.1.22.el5 (RHEL 5),
         2.6.22.14 vanilla (kernel.org).
        * Client support for unpatched kernels:
@@ -14,6 +14,10 @@ tbd  Sun Microsystems, Inc.
        * File join has been disabled in this release, refer to Bugzilla 16929.
 
 Severity   : enhancement
+Bugzilla   : 18061
+Description: Update to SLES10 kernel-2.6.16.60-0.33.
+
+Severity   : enhancement
 Bugzilla   : 18060
 Description: Update to RHEL5 kernel-2.6.18-92.1.22.el5.
 

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index bfa8365..16fbde5 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.31"
+lnxrel="60-0.33"
 
 # 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 8880cff..87465ea 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.31
+2.6-sles10            SLES10: 2.6.16.60-0.33
 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