land b_eq on HEAD

[fs/lustre-release.git] / lustre / kernel_patches / patches / 2.6.0-test6-mm4.patch

diff --git a/lustre/kernel_patches/patches/2.6.0-test6-mm4.patch b/lustre/kernel_patches/patches/2.6.0-test6-mm4.patch
index 6293972..ff8d63b 100644 (file)
--- a/lustre/kernel_patches/patches/2.6.0-test6-mm4.patch
+++ b/lustre/kernel_patches/patches/2.6.0-test6-mm4.patch
@@ -14430,7 +14430,7 @@
 +++ 25/arch/parisc/lib/checksum.c      2003-10-05 00:33:23.000000000 -0700
 @@ -16,8 +16,10 @@
   *
-  * $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
+  * $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
   */
 -#include <net/checksum.h>
 +#include <linux/module.h>
@@ -31511,8 +31511,8 @@
 --- linux-2.6.0-test6/drivers/char/ftape/compressor/zftape-compress.c  2003-06-14 12:18:32.000000000 -0700
 +++ 25/drivers/char/ftape/compressor/zftape-compress.c 2003-10-05 00:33:24.000000000 -0700
 @@ -31,6 +31,7 @@
-  char zftc_rev[] = "$Revision: 1.3 $";
-  char zftc_dat[] = "$Date: 2003/12/03 05:12:20 $";
+  char zftc_rev[] = "$Revision: 1.4 $";
+  char zftc_dat[] = "$Date: 2004/02/14 03:14:33 $";
  
 +#include <linux/version.h>
  #include <linux/errno.h>
@@ -37169,8 +37169,8 @@
 --- linux-2.6.0-test6/drivers/isdn/hardware/eicon/divamnt.c    2003-09-27 18:57:44.000000000 -0700
 +++ 25/drivers/isdn/hardware/eicon/divamnt.c   2003-10-05 00:33:24.000000000 -0700
 @@ -1,4 +1,4 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
-+/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
+-/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
++/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
   *
   * Driver for Eicon DIVA Server ISDN cards.
   * Maint module
@@ -37181,16 +37181,16 @@
 -#include "di_defs.h"
  #include "debug_if.h"
  
--static char *main_revision = "$Revision: 1.3 $";
-+static char *main_revision = "$Revision: 1.3 $";
+-static char *main_revision = "$Revision: 1.4 $";
++static char *main_revision = "$Revision: 1.4 $";
  
  static int major;
  
 --- linux-2.6.0-test6/drivers/isdn/hardware/eicon/divasmain.c  2003-09-27 18:57:44.000000000 -0700
 +++ 25/drivers/isdn/hardware/eicon/divasmain.c 2003-10-05 00:33:24.000000000 -0700
 @@ -1,4 +1,4 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
-+/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
+-/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
++/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
   *
   * Low level driver for Eicon DIVA Server ISDN cards.
   *
@@ -37212,16 +37212,16 @@
  #include "diva_dma.h"
  #include "diva_pci.h"
  
--static char *main_revision = "$Revision: 1.3 $";
-+static char *main_revision = "$Revision: 1.3 $";
+-static char *main_revision = "$Revision: 1.4 $";
++static char *main_revision = "$Revision: 1.4 $";
  
  static int major;
  
 --- linux-2.6.0-test6/drivers/isdn/hardware/eicon/dqueue.c     2003-06-14 12:18:22.000000000 -0700
 +++ 25/drivers/isdn/hardware/eicon/dqueue.c    2003-10-05 00:33:24.000000000 -0700
 @@ -1,10 +1,10 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
-+/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
+-/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
++/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
   *
   * Driver for Eicon DIVA Server ISDN cards.
   * User Mode IDI Interface
@@ -37236,8 +37236,8 @@
 --- linux-2.6.0-test6/drivers/isdn/hardware/eicon/mntfunc.c    2003-09-27 18:57:44.000000000 -0700
 +++ 25/drivers/isdn/hardware/eicon/mntfunc.c   2003-10-05 00:33:24.000000000 -0700
 @@ -1,4 +1,4 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
-+/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
+-/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
++/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
   *
   * Driver for Eicon DIVA Server ISDN cards.
   * Maint module
@@ -37252,8 +37252,8 @@
 --- linux-2.6.0-test6/drivers/isdn/hardware/eicon/os_capi.h    2003-06-14 12:18:25.000000000 -0700
 +++ 25/drivers/isdn/hardware/eicon/os_capi.h   2003-10-05 00:33:24.000000000 -0700
 @@ -1,10 +1,10 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
-+/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
+-/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
++/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
   *
   * ISDN interface module for Eicon active cards DIVA.
   * CAPI Interface OS include files 
@@ -37268,8 +37268,8 @@
 --- linux-2.6.0-test6/drivers/isdn/hardware/eicon/platform.h   2003-09-27 18:57:44.000000000 -0700
 +++ 25/drivers/isdn/hardware/eicon/platform.h  2003-10-05 00:33:24.000000000 -0700
 @@ -1,4 +1,4 @@
--/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
-+/* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
+-/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
++/* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
   *
   * platform.h
   * 
@@ -37754,7 +37754,7 @@
 +++ 25/drivers/media/video/planb.c     2003-10-05 00:33:24.000000000 -0700
 @@ -27,7 +27,6 @@
  
- /* $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $ */
+ /* $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $ */
  
 -#include <linux/version.h>
  #include <linux/init.h>
@@ -38069,7 +38069,7 @@
 --- linux-2.6.0-test6/drivers/mtd/chips/map_rom.c      2003-06-14 12:18:24.000000000 -0700
 +++ 25/drivers/mtd/chips/map_rom.c     2003-10-05 00:33:24.000000000 -0700
 @@ -4,7 +4,6 @@
-  * $Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $
+  * $Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $
   */
  
 -#include <linux/version.h>
@@ -42159,8 +42159,8 @@
  #include <linux/hdlc.h>
  
  /* Version */
--static const char version[] = "$Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $ for Linux\n";
-+static const char version[] = "$Id: 2.6.0-test6-mm4.patch,v 1.3 2003/12/03 05:12:20 phil Exp $ for Linux\n";
+-static const char version[] = "$Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $ for Linux\n";
++static const char version[] = "$Id: 2.6.0-test6-mm4.patch,v 1.4 2004/02/14 03:14:33 rread Exp $ for Linux\n";
  static int debug;
  static int quartz;