diff for duplicates of <20110322125736.GZ2140@cmpxchg.org>

diff --git a/a/1.txt b/N1/1.txt
index 99cb599..426f982 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -41,7 +41,9 @@ describing the exact vmap area.
 
 	Hannes
 
-_______________________________________________
-xfs mailing list
-xfs@oss.sgi.com
-http://oss.sgi.com/mailman/listinfo/xfs
+--
+To unsubscribe, send a message with 'unsubscribe linux-mm' in
+the body to majordomo@kvack.org.  For more info on Linux MM,
+see: http://www.linux-mm.org/ .
+Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
+Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
diff --git a/a/content_digest b/N1/content_digest
index e01ea75..565f0bf 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -6,12 +6,12 @@
  "Subject\0Re: [PATCH] xfs: flush vmap aliases when mapping fails\0"
  "Date\0Tue, 22 Mar 2011 13:57:36 +0100\0"
  "To\0Dave Chinner <david@fromorbit.com>\0"
- "Cc\0Nick Piggin <npiggin@kernel.dk>"
+ "Cc\0Christoph Hellwig <hch@infradead.org>"
+  Nick Piggin <npiggin@kernel.dk>
   Hugh Dickins <hughd@google.com>
+  Andrew Morton <akpm@linux-foundation.org>
   xfs@oss.sgi.com
-  Christoph Hellwig <hch@infradead.org>
-  linux-mm@kvack.org
- " Andrew Morton <akpm@linux-foundation.org>\0"
+ " linux-mm@kvack.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, Mar 21, 2011 at 01:25:26PM +0100, Johannes Weiner wrote:\n"
@@ -57,9 +57,11 @@
  "\n"
  "\tHannes\n"
  "\n"
- "_______________________________________________\n"
- "xfs mailing list\n"
- "xfs@oss.sgi.com\n"
- http://oss.sgi.com/mailman/listinfo/xfs
+ "--\n"
+ "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n"
+ "the body to majordomo@kvack.org.  For more info on Linux MM,\n"
+ "see: http://www.linux-mm.org/ .\n"
+ "Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/\n"
+ "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>"
 
-52eec766519c29fd8c4a534efc27069d754a48a34d7e0ca7da28d812b60d83bb
+ff4014363ebc9ad89a536b79d8ca91d5e2fe30a654fb9798a2aee42d1cf1a8d1
