Branch b1_8

b=19212

i=shadow, bobijam

Update to SLES10 2.6.16.60-0.37 kernel.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 775d8b5..0014250 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,7 +1,7 @@
 tbd Sun Microsystems, Inc.
        * version 1.8.1
        * Support for kernels:
-        2.6.16.60-0.33 (SLES 10),
+        2.6.16.60-0.37 (SLES 10),
         2.6.18-128.1.1.el5 (RHEL 5),
         2.6.22.14 vanilla (kernel.org)
        * Client support for unpatched kernels:
@@ -15,6 +15,10 @@ tbd Sun Microsystems, Inc.
          more information, please refer to bugzilla 17630.
 
 Severity   : enhancement
+Bugzilla   : 19212
+Description: Update kernel to SLES10 SP2 2.6.16.60-0.37.
+
+Severity   : enhancement
 Bugzilla   : 12182
 Description: Caching OSS
 Details    : introduce data caching on the OSS. The OSS now relies on the linux

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index 1aa70c6..a99a946 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.33"
+lnxrel="60-0.37_f594963d"
 
 # 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 7431872..4c4756b 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -4,7 +4,7 @@ SUPPORTED KERNELS:
 2.6-suse              SLES9 before SP1         already in SLES9 SP1 kernel
 2.6-suse-newer        SLES9: 2.6.5-7.315       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.33
+2.6-sles10            SLES10: 2.6.16.60-0.37
 2.6-rhel5             RHEL5: 2.6.18-128.1.1.el5
 2.6.18-vanilla        kernel.org: 2.6.18.8
 2.6.22-vanilla        kernel.org: 2.6.22.14