Branch b1_6

b=14858
i=adilger
i=johann

Update SLES10 SP1 kernel to 2.6.16.54-0.2.5.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 11cf07a..c760d1b 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -3,7 +3,7 @@ tbd  Sun Microsystems, Inc.
        * Support for kernels:
         2.6.5-7.308 (SLES 9),
         2.6.9-67.0.4.EL (RHEL 4),
-        2.6.16.54-0.2.3 (SLES 10),
+        2.6.16.54-0.2.5 (SLES 10),
         2.6.18-53.1.6.el5 (RHEL 5),
         2.6.18.8 vanilla (kernel.org)
        * Client support for unpatched kernels:
@@ -18,6 +18,10 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
 
 Severity   : enhancement
+Bugzilla   : 14858
+Description: Update to SLES10 SP1 latest kernel-2.6.16.54-0.2.5.
+
+Severity   : enhancement
 Bugzilla   : 14720
 Description: Update to RHEL5 latest kernel-2.6.18-53.1.6.el5.
 

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index 92b75f5..6ac2e0f 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="54-0.2.3"
+lnxrel="54-0.2.5"
 
 EXTRA_VERSION_DELIMITER="."
 

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index cfbaf22..35da0f3 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.308       extra patches for SLES9 after SP1
 2.6-rhel4             RHEL4: 2.6.9-67.0.4.EL
-2.6-sles10            SLES10: 2.6.16.54-0.2.3
+2.6-sles10            SLES10: 2.6.16.54-0.2.5
 2.6-rhel5             RHEL5: 2.6.18-53.1.6.el5
 2.6.18-vanilla.series kernel.org: 2.6.18.8