Branch HEAD

Merge from b_release_1_4_9: update SLES 9 kernel to 2.6.5-7.283.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 91bdd18..2897524 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -9,7 +9,7 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
         for details.
        * Support for kernels:
         2.6.9-42.0.8EL (RHEL 4)
         for details.
        * Support for kernels:
         2.6.9-42.0.8EL (RHEL 4)

-        2.6.5-7.276 (SLES 9)
+        2.6.5-7.283 (SLES 9)

         2.4.21-47.0.1.EL (RHEL 3)
         2.6.12.6 vanilla (kernel.org)
         2.6.16.21-0.8 (SLES10)
         2.4.21-47.0.1.EL (RHEL 3)
         2.6.12.6 vanilla (kernel.org)
         2.6.16.21-0.8 (SLES10)

diff --git a/lustre/kernel_patches/targets/2.6-suse.target.in b/lustre/kernel_patches/targets/2.6-suse.target.in
index 847f9a8..757ed4d 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-suse.target.in
+++ b/lustre/kernel_patches/targets/2.6-suse.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.5"
 lnxmaj="2.6.5"

-lnxrel="7.282"
+lnxrel="7.283"

 
 KERNEL=linux-$lnxmaj-$lnxrel.tar.bz2
 # they include our patches
 
 KERNEL=linux-$lnxmaj-$lnxrel.tar.bz2
 # they include our patches