From: yangsheng <yangsheng>
Date: Thu, 24 Jul 2008 05:49:17 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: GIT_EPOCH_B_RELEASE_1_6_7~2^3~433
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=cd181eede7d913af4ae9f27276f146c959b6a032;p=fs%2Flustre-release.git

Branch b1_6
b=16190
i=johann, shadow, zhenyu.xu

Update to RHEL5 kernel-2.6.18-92.1.6.el5 and update to OFED-1.3.1.
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 2d9fb85..2c6e64d 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-53.1.21.el5 (RHEL 5),
+	 2.6.18-92.1.6.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)
@@ -38,6 +38,10 @@ tbd Sun Microsystems, Inc.
 	* Output of lfs quota has been made less detailed by default,
 	  old (verbose) output can be obtained by using -v option.
 
+Severity   : enhancement
+Bugzilla   : 16190
+Description: Update to RHEL5 kernel-2.6.18-92.1.6.el5.
+
 Severity   : normal
 Bugzilla   : 16318
 Frequency  : rare, on PPC clients
diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index c3a0193..d0cdeec 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="53.1.21.el5"
+lnxrel="92.1.6.el5"
 
 KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=2.6-rhel5.series
@@ -9,7 +9,7 @@ RHBUILD=1
 LINUX26=1
 LUSTRE_VERSION=@VERSION@
 
-OFED_VERSION=1.3
+OFED_VERSION=1.3.1
 
 BASE_ARCHS="i686 x86_64 ia64 ppc64"
 BIGMEM_ARCHS=""