From: yangsheng <yangsheng>
Date: Fri, 4 Jul 2008 06:49:38 +0000 (+0000)
Subject: Branch b1_8
X-Git-Tag: v1_8_0_110~415
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8b4dfbfdca1c687780ba487d77f561317069db51;p=fs%2Flustre-release.git

Branch b1_8
b=16190

Back the change since OFED-1.3 build failed with this kernel.
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 4477e00..b38afdf 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -4,7 +4,7 @@ tbd Sun Microsystems, Inc.
 	 2.6.5-7.311 (SLES 9),
 	 2.6.9-67.0.20.EL (RHEL 4),
 	 2.6.16.54-0.2.5 (SLES 10),
-         2.6.18-92.1.6.el5 (RHEL 5),
+         2.6.18-53.1.21.el5 (RHEL 5),
 	 2.6.22.14 vanilla (kernel.org)
 	* Client support for unpatched kernels:
 	  (see http://wiki.lustre.org/index.php?title=Patchless_Client)
@@ -25,10 +25,6 @@ tbd Sun Microsystems, Inc.
 	  For more information, please refer to bugzilla 13904.
 
 Severity   : enhancement
-Bugzilla   : 16190
-Description: Update to RHEL5 kernel-2.6.18-92.1.6.el5.
-
-Severity   : enhancement
 Bugzilla   : 16189
 Description: Update to RHEL4 kernel-2.6.9-67.0.20.
 
diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index 5e49e86..ccaa05e 100644
--- 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="92.1.6.el5"
+lnxrel="53.1.21.el5"
 
 KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=2.6-rhel5.series