Branch b1_8

b=20400

i=shadow, bobijam

Update kernel to RHEL5 2.6.18-128.7.1.el5.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 2b8f143..8342644 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -3,7 +3,7 @@ tbd Sun Microsystems, Inc.
        * Support for kernels:
          2.6.16.60-0.42.4 (SLES 10),
          2.6.27.23-0.1 (SLES11),
-         2.6.18-128.1.14.el5 (RHEL 5)
+         2.6.18-128.7.1.el5 (RHEL 5)
        * Client support for unpatched kernels:
          (see http://wiki.lustre.org/index.php?title=Patchless_Client)
          2.6.16 - 2.6.30 vanilla (kernel.org)
@@ -15,6 +15,10 @@ tbd Sun Microsystems, Inc.
          more information, please refer to bugzilla 17630.
 
 Severity   : enhancement
+Bugzilla   : 20400
+Description: Update kernel to RHEL5 2.6.18-128.7.1.el5.
+
+Severity   : enhancement
 Bugzilla   : 20758
 Description: Update kernel to SLES10 SP2 2.6.16.60-0.42.4.
 

diff --git a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch
index e66bf54..deb8b60 100644 (file)
--- a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch
+++ b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch
@@ -382,9 +382,9 @@ Index: linux-2.6.18-128.1.14/include/linux/page-flags.h
 --- linux-2.6.18-128.1.14.orig/include/linux/page-flags.h      2009-06-19 12:33:11.000000000 -0600
 +++ linux-2.6.18-128.1.14/include/linux/page-flags.h   2009-06-19 12:34:50.000000000 -0600
 @@ -87,6 +87,7 @@
+ #define PG_reclaim            17      /* To be reclaimed asap */
  #define PG_nosave_free                18      /* Free, should not be written */
  #define PG_buddy              19      /* Page is free, on buddy lists */
- #define PG_gup                        20      /* Page pin may be because of gup */
 +#define PG_constant           21      /* To mark if the page is constant */
  #define PG_xpmem              27      /* Testing for xpmem. */
  

diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index 66c7a3a..a21e014 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel5.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.18"
-lnxrel="128.1.14.el5"
+lnxrel="128.7.1.el5"
 
 KERNEL_SRPM=kernel-$lnxmaj-$lnxrel.src.rpm
 SERIES=2.6-rhel5.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 0df823e..1e60c07 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-sles10            SLES10: 2.6.16.60-0.42.4
-2.6-rhel5             RHEL5: 2.6.18-128.1.14.el5
+2.6-rhel5             RHEL5: 2.6.18-128.7.1.el5
 2.6.18-vanilla        kernel.org: 2.6.18.8
 2.6.22-vanilla        kernel.org: 2.6.22.14
 2.6-sles11            SLES11: 2.6.27.23-0.1