b=20595

i=yangsheng

Build support for OFED 1.4.2.

diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c
index df15cd0..3ce3013 100644 (file)
--- a/lnet/utils/debug.c
+++ b/lnet/utils/debug.c
@@ -352,7 +352,7 @@ static int cmp_rec(const void *p1, const void *p2)
                 return 0;
         return 1;
 }
-  
+
 static void print_rec(struct dbg_line ***linevp, int used, int fdout)
 {
         struct dbg_line **linev = *linevp;
@@ -561,7 +561,7 @@ print:
 
         printf("Debug log: %lu lines, %lu kept, %lu dropped, %lu bad.\n",
                 dropped + kept + bad, kept, dropped, bad);
-  
+
         return 0;
 }
 
@@ -598,7 +598,7 @@ int jt_dbg_debug_kernel(int argc, char **argv)
 
         if (stat(filename, &st) == 0 && S_ISREG(st.st_mode))
                 unlink(filename);
-  
+
         fdin = dbg_open_ctlhandle(DUMP_KERNEL_CTL_NAME);
         if (fdin < 0) {
                 fprintf(stderr, "open(dump_kernel) failed: %s\n",
@@ -617,7 +617,7 @@ int jt_dbg_debug_kernel(int argc, char **argv)
 
         if (raw)
                 return 0;
-  
+
         fdin = open(filename, O_RDONLY);
         if (fdin < 0) {
                 if (errno == ENOENT) /* no dump file created */

diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index 2f96002..14b61af 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel4.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in
@@ -9,7 +9,7 @@ RHBUILD=1
 LINUX26=1
 LUSTRE_VERSION=@VERSION@
 
-OFED_VERSION=1.4.1-rc4
+OFED_VERSION=1.4.2
 
 BASE_ARCHS="i686 x86_64 ia64"
 BIGMEM_ARCHS=""

diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index ab9e7d7..66c7a3a 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel5.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in
@@ -6,7 +6,7 @@ SERIES=2.6-rhel5.series
 EXTRA_VERSION=${lnxrel}_lustre.@VERSION@
 LUSTRE_VERSION=@VERSION@
 
-OFED_VERSION=1.4.1-rc6
+OFED_VERSION=1.4.2
 
 BASE_ARCHS="i686 x86_64 ia64 ppc64"
 BIGMEM_ARCHS=""

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index 60261c6..4de5551 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-sles10.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles10.target.in
@@ -19,7 +19,7 @@ VERSION=$lnxmaj
 EXTRA_VERSION="${lnxrel}_lustre.@VERSION@"
 LUSTRE_VERSION=@VERSION@
 
-OFED_VERSION=1.4.1-rc6
+OFED_VERSION=1.4.2
 
 BASE_ARCHS="i686 ppc x86_64 ia64 ppc64"
 BIGMEM_ARCHS=""