Branch b1_6

b=17374
i=shadow, bobijam

kernel update for sles9 2.6.5-7.314.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 6ccd275..d0d723d 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,7 +1,7 @@
 tbd Sun Microsystems, Inc.
        * version 1.6.7
        * Support for kernels:
-        2.6.5-7.312 (SLES 9),
+        2.6.5-7.314 (SLES 9),
         2.6.9-67.0.22.EL (RHEL 4),
         2.6.16.60-0.31 (SLES 10),
         2.6.18-92.1.10.el5 (RHEL 5),
@@ -43,6 +43,10 @@ tbd Sun Microsystems, Inc.
          MPICH2-1.0.7
 
 Severity   : enhancement
+Bugzilla   : 17374
+Description: Update to sles9 kernel-2.6.5-7.314.
+
+Severity   : enhancement
 Bugzilla   : 17458
 Description: Update to SLES10 SP2 kernel-2.6.16.60-0.31.
 

diff --git a/lustre/kernel_patches/targets/2.6-suse.target.in b/lustre/kernel_patches/targets/2.6-suse.target.in
index f288e19..be6dcb8 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"
-lnxrel="7.312"
+lnxrel="7.314"
 
 KERNEL=linux-$lnxmaj-$lnxrel.tar.bz2
 # they include our patches

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 5fa560b..18e77a3 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-suse              SLES9 before SP1         already in SLES9 SP1 kernel
-2.6-suse-newer        SLES9: 2.6.5-7.312       extra patches for SLES9 after SP1
+2.6-suse-newer        SLES9: 2.6.5-7.314       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.31
 2.6-rhel5             RHEL5: 2.6.18-92.1.10.el5