From 3e59f2afc51adf2e1d655d32950744f1d6f27263 Mon Sep 17 00:00:00 2001
From: shaver <shaver>
Date: Tue, 15 Jul 2003 08:53:59 +0000
Subject: [PATCH] Land b_unify on b_devel.

Highlights include:
 - intent rework from Peter and Phil
 - unification of VFS intent strategy for 2.4 and 2.5/2.6
 - select 2.5 kernel patches from b_ad
 - all the whitespace fixes you can imagine.

Complete diff for sanity-checking at http://off.net/~shaver/unify-landing.diff.
---
 lustre/kernel_patches/scripts/patchfns | 2 +-
 lustre/ldlm/.cvsignore                 | 1 +
 lustre/llite/.cvsignore                | 1 +
 lustre/mdc/.cvsignore                  | 1 +
 lustre/mds/.cvsignore                  | 1 +
 lustre/obdecho/.cvsignore              | 1 +
 lustre/osc/.cvsignore                  | 1 +
 lustre/ost/.cvsignore                  | 1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lustre/kernel_patches/scripts/patchfns b/lustre/kernel_patches/scripts/patchfns
index 78e494b..8d3d4f0 100644
--- a/lustre/kernel_patches/scripts/patchfns
+++ b/lustre/kernel_patches/scripts/patchfns
@@ -78,7 +78,7 @@ check_pc_match()
 		if [ $? != 0 ]; then
 			echo " $1 do not match with $2 "
 			echo " $2 will be changed to match $2"
-			cat $tmpfile > $P/pc/$PATCH_NAME.pc
+			# cat $tmpfile > $P/pc/$PATCH_NAME.pc
 		fi
 		rm -rf $tmpfile
 	fi
diff --git a/lustre/ldlm/.cvsignore b/lustre/ldlm/.cvsignore
index e995588..e69dc6d 100644
--- a/lustre/ldlm/.cvsignore
+++ b/lustre/ldlm/.cvsignore
@@ -1,3 +1,4 @@
 .deps
 Makefile
 Makefile.in
+.*.cmd
diff --git a/lustre/llite/.cvsignore b/lustre/llite/.cvsignore
index e530020..49c6100 100644
--- a/lustre/llite/.cvsignore
+++ b/lustre/llite/.cvsignore
@@ -6,3 +6,4 @@ Makefile
 Makefile.in
 .deps
 TAGS
+.*.cmd
diff --git a/lustre/mdc/.cvsignore b/lustre/mdc/.cvsignore
index e530020..49c6100 100644
--- a/lustre/mdc/.cvsignore
+++ b/lustre/mdc/.cvsignore
@@ -6,3 +6,4 @@ Makefile
 Makefile.in
 .deps
 TAGS
+.*.cmd
diff --git a/lustre/mds/.cvsignore b/lustre/mds/.cvsignore
index e530020..49c6100 100644
--- a/lustre/mds/.cvsignore
+++ b/lustre/mds/.cvsignore
@@ -6,3 +6,4 @@ Makefile
 Makefile.in
 .deps
 TAGS
+.*.cmd
diff --git a/lustre/obdecho/.cvsignore b/lustre/obdecho/.cvsignore
index e530020..49c6100 100644
--- a/lustre/obdecho/.cvsignore
+++ b/lustre/obdecho/.cvsignore
@@ -6,3 +6,4 @@ Makefile
 Makefile.in
 .deps
 TAGS
+.*.cmd
diff --git a/lustre/osc/.cvsignore b/lustre/osc/.cvsignore
index e530020..49c6100 100644
--- a/lustre/osc/.cvsignore
+++ b/lustre/osc/.cvsignore
@@ -6,3 +6,4 @@ Makefile
 Makefile.in
 .deps
 TAGS
+.*.cmd
diff --git a/lustre/ost/.cvsignore b/lustre/ost/.cvsignore
index e530020..49c6100 100644
--- a/lustre/ost/.cvsignore
+++ b/lustre/ost/.cvsignore
@@ -6,3 +6,4 @@ Makefile
 Makefile.in
 .deps
 TAGS
+.*.cmd
-- 
1.8.3.1