Branch b1_8

b=18062
i=johann, bobijam

Update to SLES9 kernel-2.6.5-7.315.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 5e778c0..39a130e 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.5-7.314 (SLES 9),
+        2.6.5-7.315 (SLES 9),
         2.6.9-67.0.22.EL (RHEL 4),
         2.6.16.60-0.31 (SLES 10),
         2.6.18-92.1.22.el5 (RHEL 5),
@@ -32,6 +32,10 @@ tbd Sun Microsystems, Inc.
          more information, please refer to bugzilla 17630.
 
 Severity   : enhancement
+Bugzilla   : 18062
+Description: Update to sles9 kernel-2.6.5-7.315.
+
+Severity   : enhancement
 Bugzilla   : 18060
 Description: Update to RHEL5 kernel-2.6.18-92.1.22.el5.
 

diff --git a/lustre/kernel_patches/patches/qsnet-suse-2.6.patch b/lustre/kernel_patches/patches/qsnet-suse-2.6.patch
index 27b5a52..5f0967a 100644 (file)
--- a/lustre/kernel_patches/patches/qsnet-suse-2.6.patch
+++ b/lustre/kernel_patches/patches/qsnet-suse-2.6.patch
@@ -1025,9 +1025,9 @@ Index: LINUX-SRC-TREE/include/linux/sched.h
  
  extern int mmlist_nr;
 @@ -603,6 +611,10 @@ struct task_struct {
-       struct rw_semaphore pagg_sem;
+ #ifndef __GENKSYMS__
+       struct list_head        *scm_work_list;
  #endif
- 
 +#ifdef CONFIG_PTRACK
 +/* process tracking callback */
 +      struct list_head ptrack_list;

diff --git a/lustre/kernel_patches/targets/2.6-suse.target.in b/lustre/kernel_patches/targets/2.6-suse.target.in
index be6dcb8..c97a1e3 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.314"
+lnxrel="7.315"
 
 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 0487527..238d9c5 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.314       extra patches for SLES9 after SP1
+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.31
 2.6-rhel5             RHEL5: 2.6.18-92.1.22.el5