clobber b_filterio patches with those from b_devel.

Until future notice, kernel patches must be changed only on b_devel,
and only with permission.  Kernel patch conflicts can never be
resolved cleanly.

diff --git a/lustre/kernel_patches/patches/ext3-map_inode_page_2.4.18.patch b/lustre/kernel_patches/patches/ext3-map_inode_page_2.4.18.patch
index 8386ee3..585b1eb 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-map_inode_page_2.4.18.patch
+++ b/lustre/kernel_patches/patches/ext3-map_inode_page_2.4.18.patch
@@ -5,9 +5,11 @@
  fs/ext3/inode.c        |   55 +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 58 insertions(+)
 
---- linux-2.4.18-p4smp/fs/ext3/inode.c~ext3-map_inode_page_2.4.18      2003-07-21 22:51:45.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/ext3/inode.c   2003-07-21 22:51:47.000000000 -0600
-@@ -3003,3 +3003,58 @@ int ext3_prep_san_write(struct inode *in
+Index: linux-2.4.18-p4smp/fs/ext3/inode.c
+===================================================================
+--- linux-2.4.18-p4smp.orig/fs/ext3/inode.c    Fri Jul 25 15:47:03 2003
++++ linux-2.4.18-p4smp/fs/ext3/inode.c Fri Jul 25 15:47:04 2003
+@@ -3004,3 +3004,58 @@
                ret = ret2;
        return ret;
  }
@@ -66,8 +68,10 @@
 +      unlock_kernel();
 +        return rc;
 +}
---- linux-2.4.18-p4smp/fs/ext3/ext3-exports.c~ext3-map_inode_page_2.4.18       2003-07-21 22:51:45.000000000 -0600
-+++ linux-2.4.18-p4smp-braam/fs/ext3/ext3-exports.c    2003-07-21 22:51:47.000000000 -0600
+Index: linux-2.4.18-p4smp/fs/ext3/ext3-exports.c
+===================================================================
+--- linux-2.4.18-p4smp.orig/fs/ext3/ext3-exports.c     Fri Jul 25 15:47:03 2003
++++ linux-2.4.18-p4smp/fs/ext3/ext3-exports.c  Fri Jul 25 15:47:04 2003
 @@ -9,6 +9,8 @@
  
  int ext3_prep_san_write(struct inode *inode, long *blocks,
@@ -77,10 +81,20 @@
  
  EXPORT_SYMBOL(ext3_force_commit);
  EXPORT_SYMBOL(ext3_bread);
-@@ -18,3 +20,4 @@ EXPORT_SYMBOL(ext3_xattr_get);
+@@ -18,3 +20,4 @@
  EXPORT_SYMBOL(ext3_xattr_list);
  EXPORT_SYMBOL(ext3_xattr_set);
  EXPORT_SYMBOL(ext3_prep_san_write);
 +EXPORT_SYMBOL(ext3_map_inode_page);
-
-_
+Index: linux-2.4.18-p4smp/include/linux/mm.h
+===================================================================
+--- linux-2.4.18-p4smp.orig/include/linux/mm.h Fri Jul 25 15:48:31 2003
++++ linux-2.4.18-p4smp/include/linux/mm.h      Fri Jul 25 15:49:41 2003
+@@ -186,6 +186,7 @@
+       void *virtual;                  /* Kernel virtual address (NULL if
+                                          not kmapped, ie. highmem) */
+ #endif /* CONFIG_HIGHMEM || CONFIG_SPARC64 */
++      unsigned long private;
+ } mem_map_t;
+ 
+ /*

diff --git a/lustre/kernel_patches/series/chaos-2.4.18 b/lustre/kernel_patches/series/chaos-2.4.18
index 4c32051..57b994c 100644 (file)
--- a/lustre/kernel_patches/series/chaos-2.4.18
+++ b/lustre/kernel_patches/series/chaos-2.4.18
@@ -18,4 +18,5 @@ extN-wantedi.patch
 ext3-san-2.4.20.patch
 extN-2.4.18-ino_sb_fixup.patch
 ext3-map_inode_page_2.4.18.patch
+ext3-error-export.patch
 iopen-2.4.18.patch