Branch b1_6

b=14041
i=scjody
i=johann

Update Lustre to RHEL4 latest kernel.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 044f51e..6c40778 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -2,7 +2,7 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.6.5
        * Support for kernels:
         2.6.5-7.286 (SLES 9),
-        2.6.9-55.0.9.EL (RHEL 4),
+        2.6.9-55.0.12.EL (RHEL 4),
         2.6.16.53-0.8 (SLES 10),
         2.6.18-8.1.14.el5 (RHEL 5),
         2.6.18.8 vanilla (kernel.org)
@@ -14,6 +14,10 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * Recommended e2fsprogs version: 1.40.2-cfs1
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
 
+Severity   : normal
+Bugzilla   : 14041
+Description: Update to RHEL4 latest kernel.
+
 Severity   : enhancement
 Bugzilla   : 13690
 Description: Build SLES10 patchless client fails

diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index 42ee0fe..1b4aadf 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel4.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.9"
-lnxrel="55.0.9.EL"
+lnxrel="55.0.12.EL"
 
 KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=2.6-rhel4.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 68c7d2c..632a4b8 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -3,7 +3,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.286       extra patches for SLES9 after SP1
-2.6-rhel4             RHEL4: 2.6.9-55.0.9.EL
+2.6-rhel4             RHEL4: 2.6.9-55.0.12.EL
 2.6-sles10            SLES10: 2.6.16.53-0.8
 2.6-rhel5.series      RHEL5: 2.6.18-8.1.14.el5
 2.6.18-vanilla.series kernel.org: 2.6.18.8