All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20080117214150.GA25872@linux-os.sc.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 76d47d7..f2f651c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -28,8 +28,7 @@ Venki
 Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 
 Index: linux-2.6.git/include/asm-arm/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-arm/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-arm/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-arm/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -27,6 +27,8 @@
  #include <asm/byteorder.h>
@@ -41,8 +40,7 @@ Index: linux-2.6.git/include/asm-arm/io.h
   * ISA I/O bus memory addresses are 1:1 with the physical address.
   */
 Index: linux-2.6.git/include/asm-avr32/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-avr32/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-avr32/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-avr32/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -10,6 +10,8 @@
  
@@ -54,8 +52,7 @@ Index: linux-2.6.git/include/asm-avr32/io.h
  static __inline__ unsigned long virt_to_phys(volatile void *address)
  {
 Index: linux-2.6.git/include/asm-blackfin/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-blackfin/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-blackfin/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-blackfin/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -8,6 +8,8 @@
  #endif
@@ -67,8 +64,7 @@ Index: linux-2.6.git/include/asm-blackfin/io.h
   * These are for ISA/PCI shared memory _only_ and should never be used
   * on any other type of memory, including Zorro memory. They are meant to
 Index: linux-2.6.git/include/asm-cris/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-cris/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-cris/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-cris/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -5,6 +5,8 @@
  #include <asm/arch/io.h>
@@ -80,8 +76,7 @@ Index: linux-2.6.git/include/asm-cris/io.h
  {
  	u32 (*read_mem)(void *addr, int size);
 Index: linux-2.6.git/include/asm-frv/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-frv/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-frv/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-frv/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -23,6 +23,8 @@
  #include <asm/mb-regs.h>
@@ -93,8 +88,7 @@ Index: linux-2.6.git/include/asm-frv/io.h
   * swap functions are sometimes needed to interface little-endian hardware
   */
 Index: linux-2.6.git/include/asm-h8300/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-h8300/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-h8300/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-h8300/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -13,6 +13,8 @@
  #error UNKNOWN CPU TYPE
@@ -106,8 +100,7 @@ Index: linux-2.6.git/include/asm-h8300/io.h
  /*
   * These are for ISA/PCI shared memory _only_ and should never be used
 Index: linux-2.6.git/include/asm-m32r/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-m32r/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-m32r/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-m32r/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -5,6 +5,8 @@
  #include <linux/compiler.h>
@@ -119,8 +112,7 @@ Index: linux-2.6.git/include/asm-m32r/io.h
  
  #define IO_SPACE_LIMIT  0xFFFFFFFF
 Index: linux-2.6.git/include/asm-m68knommu/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-m68knommu/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-m68knommu/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-m68knommu/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -1,6 +1,8 @@
  #ifndef _M68KNOMMU_IO_H
@@ -132,8 +124,7 @@ Index: linux-2.6.git/include/asm-m68knommu/io.h
  
  
 Index: linux-2.6.git/include/asm-ppc/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-ppc/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-ppc/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-ppc/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -10,6 +10,8 @@
  #include <asm/synch.h>
@@ -145,8 +136,7 @@ Index: linux-2.6.git/include/asm-ppc/io.h
  #define SIO_CONFIG_RD	0x399
  
 Index: linux-2.6.git/include/asm-s390/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-s390/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-s390/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-s390/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -15,6 +15,8 @@
  
@@ -158,8 +148,7 @@ Index: linux-2.6.git/include/asm-s390/io.h
  
  /*
 Index: linux-2.6.git/include/asm-sparc/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-sparc/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-sparc/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-sparc/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -11,6 +11,8 @@
  #include <asm/page.h>      /* IO address mapping routines need this */
@@ -171,8 +160,7 @@ Index: linux-2.6.git/include/asm-sparc/io.h
  
  static inline u32 flip_dword (u32 l)
 Index: linux-2.6.git/include/asm-sparc64/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-sparc64/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-sparc64/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-sparc64/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -9,6 +9,8 @@
  #include <asm/system.h>
@@ -184,8 +172,7 @@ Index: linux-2.6.git/include/asm-sparc64/io.h
  #define __SLOW_DOWN_IO	do { } while (0)
  #define SLOW_DOWN_IO	do { } while (0)
 Index: linux-2.6.git/include/asm-um/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-um/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-um/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-um/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -3,6 +3,8 @@
  
@@ -197,8 +184,7 @@ Index: linux-2.6.git/include/asm-um/io.h
  
  static inline int inb(unsigned long i) { return(0); }
 Index: linux-2.6.git/include/asm-v850/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-v850/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-v850/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-v850/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -14,6 +14,8 @@
  #ifndef __V850_IO_H__
@@ -210,8 +196,7 @@ Index: linux-2.6.git/include/asm-v850/io.h
  
  #define readb(addr) \
 Index: linux-2.6.git/include/asm-xtensa/io.h
-===================================================================
---- linux-2.6.git.orig/include/asm-xtensa/io.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-xtensa/io.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-xtensa/io.h	2008-01-17 06:39:13.000000000 -0800
 @@ -18,6 +18,8 @@
  
@@ -223,8 +208,7 @@ Index: linux-2.6.git/include/asm-xtensa/io.h
  #define XCHAL_KIO_BYPASS_VADDR	0xf8000000
  #define XCHAL_KIO_PADDR		0xf0000000
 Index: linux-2.6.git/include/asm-generic/iomap.h
-===================================================================
---- linux-2.6.git.orig/include/asm-generic/iomap.h	2008-01-17 06:28:06.000000000 -0800
+=================================--- linux-2.6.git.orig/include/asm-generic/iomap.h	2008-01-17 06:28:06.000000000 -0800
 +++ linux-2.6.git/include/asm-generic/iomap.h	2008-01-17 06:39:39.000000000 -0800
 @@ -2,6 +2,7 @@
  #define __GENERIC_IO_H
@@ -234,12 +218,3 @@ Index: linux-2.6.git/include/asm-generic/iomap.h
  #include <asm/byteorder.h>
  
  /*
-
--------------------------------------------------------------------------
-This SF.net email is sponsored by: Microsoft
-Defy all challenges. Microsoft(R) Visual Studio 2008.
-http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-_______________________________________________
-User-mode-linux-devel mailing list
-User-mode-linux-devel@lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
diff --git a/a/content_digest b/N1/content_digest
index df1bcbd..f14a394 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,20 +2,20 @@
  "ref\0924EFEDD5F540B4284297C4DC59F3DEE5E90DF@orsmsx423.amr.corp.intel.com\0"
  "ref\020080117211437.GA7573@c2.user-mode-linux.org\0"
  "From\0Venki Pallipadi <venkatesh.pallipadi@intel.com>\0"
- "Subject\0Re: [uml-devel] [-mm Patch] uml: fix a building error\0"
- "Date\0Thu, 17 Jan 2008 13:41:50 -0800\0"
+ "Subject\0Re: [-mm Patch] uml: fix a building error\0"
+ "Date\0Thu, 17 Jan 2008 21:41:50 +0000\0"
  "To\0Jeff Dike <jdike@addtoit.com>\0"
- "Cc\0user-mode-linux-devel@lists.sourceforge.net"
-  Ingo Molnar <mingo@elte.hu>
-  linux-kernel@vger.kernel.org
-  Mariusz Kozlowski <m.kozlowski@tuxland.pl>
-  Thomas Gleixner <tglx@linutronix.de>
-  Pallipadi
+ "Cc\0Pallipadi"
   Venkatesh <venkatesh.pallipadi@intel.com>
-  sparclinux@vger.kernel.org
-  WANG Cong <xiyou.wangcong@gmail.com>
   Andrew Morton <akpm@linux-foundation.org>
- " David Miller <davem@davemloft.net>\0"
+  Mariusz Kozlowski <m.kozlowski@tuxland.pl>
+  WANG Cong <xiyou.wangcong@gmail.com>
+  linux-kernel@vger.kernel.org
+  user-mode-linux-devel@lists.sourceforge.net
+  David Miller <davem@davemloft.net>
+  sparclinux@vger.kernel.org
+  Ingo Molnar <mingo@elte.hu>
+ " Thomas Gleixner <tglx@linutronix.de>\0"
  "\00:1\0"
  "b\0"
  "On Thu, Jan 17, 2008 at 04:14:37PM -0500, Jeff Dike wrote:\n"
@@ -48,8 +48,7 @@
  "Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>\n"
  "\n"
  "Index: linux-2.6.git/include/asm-arm/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-arm/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-arm/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-arm/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -27,6 +27,8 @@\n"
  " #include <asm/byteorder.h>\n"
@@ -61,8 +60,7 @@
  "  * ISA I/O bus memory addresses are 1:1 with the physical address.\n"
  "  */\n"
  "Index: linux-2.6.git/include/asm-avr32/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-avr32/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-avr32/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-avr32/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -10,6 +10,8 @@\n"
  " \n"
@@ -74,8 +72,7 @@
  " static __inline__ unsigned long virt_to_phys(volatile void *address)\n"
  " {\n"
  "Index: linux-2.6.git/include/asm-blackfin/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-blackfin/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-blackfin/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-blackfin/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -8,6 +8,8 @@\n"
  " #endif\n"
@@ -87,8 +84,7 @@
  "  * These are for ISA/PCI shared memory _only_ and should never be used\n"
  "  * on any other type of memory, including Zorro memory. They are meant to\n"
  "Index: linux-2.6.git/include/asm-cris/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-cris/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-cris/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-cris/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -5,6 +5,8 @@\n"
  " #include <asm/arch/io.h>\n"
@@ -100,8 +96,7 @@
  " {\n"
  " \tu32 (*read_mem)(void *addr, int size);\n"
  "Index: linux-2.6.git/include/asm-frv/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-frv/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-frv/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-frv/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -23,6 +23,8 @@\n"
  " #include <asm/mb-regs.h>\n"
@@ -113,8 +108,7 @@
  "  * swap functions are sometimes needed to interface little-endian hardware\n"
  "  */\n"
  "Index: linux-2.6.git/include/asm-h8300/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-h8300/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-h8300/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-h8300/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -13,6 +13,8 @@\n"
  " #error UNKNOWN CPU TYPE\n"
@@ -126,8 +120,7 @@
  " /*\n"
  "  * These are for ISA/PCI shared memory _only_ and should never be used\n"
  "Index: linux-2.6.git/include/asm-m32r/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-m32r/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-m32r/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-m32r/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -5,6 +5,8 @@\n"
  " #include <linux/compiler.h>\n"
@@ -139,8 +132,7 @@
  " \n"
  " #define IO_SPACE_LIMIT  0xFFFFFFFF\n"
  "Index: linux-2.6.git/include/asm-m68knommu/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-m68knommu/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-m68knommu/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-m68knommu/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -1,6 +1,8 @@\n"
  " #ifndef _M68KNOMMU_IO_H\n"
@@ -152,8 +144,7 @@
  " \n"
  " \n"
  "Index: linux-2.6.git/include/asm-ppc/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-ppc/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-ppc/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-ppc/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -10,6 +10,8 @@\n"
  " #include <asm/synch.h>\n"
@@ -165,8 +156,7 @@
  " #define SIO_CONFIG_RD\t0x399\n"
  " \n"
  "Index: linux-2.6.git/include/asm-s390/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-s390/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-s390/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-s390/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -15,6 +15,8 @@\n"
  " \n"
@@ -178,8 +168,7 @@
  " \n"
  " /*\n"
  "Index: linux-2.6.git/include/asm-sparc/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-sparc/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-sparc/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-sparc/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -11,6 +11,8 @@\n"
  " #include <asm/page.h>      /* IO address mapping routines need this */\n"
@@ -191,8 +180,7 @@
  " \n"
  " static inline u32 flip_dword (u32 l)\n"
  "Index: linux-2.6.git/include/asm-sparc64/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-sparc64/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-sparc64/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-sparc64/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -9,6 +9,8 @@\n"
  " #include <asm/system.h>\n"
@@ -204,8 +192,7 @@
  " #define __SLOW_DOWN_IO\tdo { } while (0)\n"
  " #define SLOW_DOWN_IO\tdo { } while (0)\n"
  "Index: linux-2.6.git/include/asm-um/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-um/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-um/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-um/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -3,6 +3,8 @@\n"
  " \n"
@@ -217,8 +204,7 @@
  " \n"
  " static inline int inb(unsigned long i) { return(0); }\n"
  "Index: linux-2.6.git/include/asm-v850/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-v850/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-v850/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-v850/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -14,6 +14,8 @@\n"
  " #ifndef __V850_IO_H__\n"
@@ -230,8 +216,7 @@
  " \n"
  " #define readb(addr) \\\n"
  "Index: linux-2.6.git/include/asm-xtensa/io.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-xtensa/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-xtensa/io.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-xtensa/io.h\t2008-01-17 06:39:13.000000000 -0800\n"
  "@@ -18,6 +18,8 @@\n"
  " \n"
@@ -243,8 +228,7 @@
  " #define XCHAL_KIO_BYPASS_VADDR\t0xf8000000\n"
  " #define XCHAL_KIO_PADDR\t\t0xf0000000\n"
  "Index: linux-2.6.git/include/asm-generic/iomap.h\n"
- "===================================================================\n"
- "--- linux-2.6.git.orig/include/asm-generic/iomap.h\t2008-01-17 06:28:06.000000000 -0800\n"
+ "=================================--- linux-2.6.git.orig/include/asm-generic/iomap.h\t2008-01-17 06:28:06.000000000 -0800\n"
  "+++ linux-2.6.git/include/asm-generic/iomap.h\t2008-01-17 06:39:39.000000000 -0800\n"
  "@@ -2,6 +2,7 @@\n"
  " #define __GENERIC_IO_H\n"
@@ -253,15 +237,6 @@
  "+#include <linux/compiler.h>\n"
  " #include <asm/byteorder.h>\n"
  " \n"
- " /*\n"
- "\n"
- "-------------------------------------------------------------------------\n"
- "This SF.net email is sponsored by: Microsoft\n"
- "Defy all challenges. Microsoft(R) Visual Studio 2008.\n"
- "http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/\n"
- "_______________________________________________\n"
- "User-mode-linux-devel mailing list\n"
- "User-mode-linux-devel@lists.sourceforge.net\n"
- https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
+  /*
 
-c581288e2f3422ad782a7930da749fb4fd05bef2fbece214f14ed73a0e26eba6
+1ddc0efec5648ff75d17d39cf75cce8d43ef5d5472d5cd5a7ea33b4ce3e3c4b9

diff --git a/a/1.txt b/N2/1.txt
index 76d47d7..9be1d6d 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -234,12 +234,3 @@ Index: linux-2.6.git/include/asm-generic/iomap.h
  #include <asm/byteorder.h>
  
  /*
-
--------------------------------------------------------------------------
-This SF.net email is sponsored by: Microsoft
-Defy all challenges. Microsoft(R) Visual Studio 2008.
-http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-_______________________________________________
-User-mode-linux-devel mailing list
-User-mode-linux-devel@lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
diff --git a/a/content_digest b/N2/content_digest
index df1bcbd..e5c676b 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,20 +2,20 @@
  "ref\0924EFEDD5F540B4284297C4DC59F3DEE5E90DF@orsmsx423.amr.corp.intel.com\0"
  "ref\020080117211437.GA7573@c2.user-mode-linux.org\0"
  "From\0Venki Pallipadi <venkatesh.pallipadi@intel.com>\0"
- "Subject\0Re: [uml-devel] [-mm Patch] uml: fix a building error\0"
+ "Subject\0Re: [-mm Patch] uml: fix a building error\0"
  "Date\0Thu, 17 Jan 2008 13:41:50 -0800\0"
  "To\0Jeff Dike <jdike@addtoit.com>\0"
- "Cc\0user-mode-linux-devel@lists.sourceforge.net"
-  Ingo Molnar <mingo@elte.hu>
-  linux-kernel@vger.kernel.org
-  Mariusz Kozlowski <m.kozlowski@tuxland.pl>
-  Thomas Gleixner <tglx@linutronix.de>
-  Pallipadi
+ "Cc\0Pallipadi"
   Venkatesh <venkatesh.pallipadi@intel.com>
-  sparclinux@vger.kernel.org
-  WANG Cong <xiyou.wangcong@gmail.com>
   Andrew Morton <akpm@linux-foundation.org>
- " David Miller <davem@davemloft.net>\0"
+  Mariusz Kozlowski <m.kozlowski@tuxland.pl>
+  WANG Cong <xiyou.wangcong@gmail.com>
+  linux-kernel@vger.kernel.org
+  user-mode-linux-devel@lists.sourceforge.net
+  David Miller <davem@davemloft.net>
+  sparclinux@vger.kernel.org
+  Ingo Molnar <mingo@elte.hu>
+ " Thomas Gleixner <tglx@linutronix.de>\0"
  "\00:1\0"
  "b\0"
  "On Thu, Jan 17, 2008 at 04:14:37PM -0500, Jeff Dike wrote:\n"
@@ -253,15 +253,6 @@
  "+#include <linux/compiler.h>\n"
  " #include <asm/byteorder.h>\n"
  " \n"
- " /*\n"
- "\n"
- "-------------------------------------------------------------------------\n"
- "This SF.net email is sponsored by: Microsoft\n"
- "Defy all challenges. Microsoft(R) Visual Studio 2008.\n"
- "http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/\n"
- "_______________________________________________\n"
- "User-mode-linux-devel mailing list\n"
- "User-mode-linux-devel@lists.sourceforge.net\n"
- https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
+  /*
 
-c581288e2f3422ad782a7930da749fb4fd05bef2fbece214f14ed73a0e26eba6
+a04dac2619799b3d80f23ed16eaf1379b992c3df55fad3876f90183de170b6e7

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.