Branch b1_6

b=14793
i=adilger
i=johann

Update RHEL4 kernel to 2.6.9-67.0.4.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 831cf30..061e33c 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -2,7 +2,7 @@ tbd  Sun Microsystems, Inc.
        * version 1.6.5
        * Support for kernels:
         2.6.5-7.308 (SLES 9),
-        2.6.9-67.0.1.EL (RHEL 4),
+        2.6.9-67.0.4.EL (RHEL 4),
         2.6.16.54-0.2.3 (SLES 10),
         2.6.18-53.1.4.el5 (RHEL 5),
         2.6.18.8 vanilla (kernel.org)
@@ -17,6 +17,10 @@ tbd  Sun Microsystems, Inc.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         removed cwd "./" (refer to Bugzilla 14399).
 
+Serverity  : enhancement
+Bugzilla   : 14793
+Description: Update RHEL4 kernel to 2.6.9-67.0.4.
+
 Severity   : minor
 Frequency  : rare on shutdown ost
 Bugzilla   : 13196

diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index fe09217..801b152 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="67.0.1.EL"
+lnxrel="67.0.4.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 030fbe0..4c03742 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.308       extra patches for SLES9 after SP1
-2.6-rhel4             RHEL4: 2.6.9-67.0.1.EL
+2.6-rhel4             RHEL4: 2.6.9-67.0.4.EL
 2.6-sles10            SLES10: 2.6.16.54-0.2.3
 2.6-rhel5.series      RHEL5: 2.6.18-53.1.4.el5
 2.6.18-vanilla.series kernel.org: 2.6.18.8