From: phil <phil>
Date: Tue, 22 Jul 2003 13:51:07 +0000 (+0000)
Subject: partial merge of b_unify into b_devel (20030722_0202)
X-Git-Tag: v1_7_100~1^97~31
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=de6df1a38e848ebcf10d208f021493daec0e5f73;p=fs%2Flustre-release.git

partial merge of b_unify into b_devel (20030722_0202)
---

diff --git a/lustre/kernel_patches/patches/uml_compile_fixes.patch b/lustre/kernel_patches/patches/uml_compile_fixes.patch
deleted file mode 100644
index 815bd92..0000000
--- a/lustre/kernel_patches/patches/uml_compile_fixes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 0 files changed
-
---- linux-2.4.18-17.8.0/include/asm-um/pgtable.h~uml_compile_fixes	2002-12-06 15:46:21.000000000 -0800
-+++ linux-2.4.18-17.8.0-zab/include/asm-um/pgtable.h	2002-12-06 15:46:21.000000000 -0800
-@@ -200,7 +200,7 @@ static inline void pgd_clear(pgd_t * pgd
-  * called on a highmem page.
-  */
- 
--#define page_address(page) ({ if (!(page)->virtual) BUG(); (page)->virtual; })
-+//#define page_address(page) ({ if (!(page)->virtual) BUG(); (page)->virtual; })
- #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
- 
- extern struct page *pte_mem_map(pte_t pte);
-
-_
diff --git a/lustre/kernel_patches/pc/uml_compile_fixes.pc b/lustre/kernel_patches/pc/uml_compile_fixes.pc
deleted file mode 100644
index cd28cbd..0000000
--- a/lustre/kernel_patches/pc/uml_compile_fixes.pc
+++ /dev/null
@@ -1 +0,0 @@
-include/asm-um/pgtable.h
diff --git a/lustre/kernel_patches/txt/uml_compile_fixes.txt b/lustre/kernel_patches/txt/uml_compile_fixes.txt
deleted file mode 100644
index 010cdb7..0000000
--- a/lustre/kernel_patches/txt/uml_compile_fixes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-DESC
-(undescribed patch)
-EDESC
diff --git a/lustre/ptlrpc/.cvsignore b/lustre/ptlrpc/.cvsignore
index 067f05c..cf51f30 100644
--- a/lustre/ptlrpc/.cvsignore
+++ b/lustre/ptlrpc/.cvsignore
@@ -7,3 +7,4 @@ Makefile.in
 .deps
 tags
 TAGS
+.*.cmd