diff for duplicates of <20150122202033.GA14817@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index 451778d..b9e0808 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,3 +8,8 @@ I did the rebase because he mentioned he wanted to get it into 3.20.
 
 Note that the conflicts were fairly trivial, so it's something we
 could just ignore and let Linus handle the merge in the worst case.
+
+_______________________________________________
+xfs mailing list
+xfs@oss.sgi.com
+http://oss.sgi.com/mailman/listinfo/xfs
diff --git a/a/content_digest b/N1/content_digest
index cf4e707..587c252 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,10 +4,10 @@
  "Subject\0Re: a simple and scalable pNFS block layout server V2\0"
  "Date\0Thu, 22 Jan 2015 21:20:34 +0100\0"
  "To\0J. Bruce Fields <bfields@fieldses.org>\0"
- "Cc\0Christoph Hellwig <hch@lst.de>"
-  Jeff Layton <jlayton@primarydata.com>
+ "Cc\0linux-fsdevel@vger.kernel.org"
   linux-nfs@vger.kernel.org
-  linux-fsdevel@vger.kernel.org
+  Jeff Layton <jlayton@primarydata.com>
+  Christoph Hellwig <hch@lst.de>
  " xfs@oss.sgi.com\0"
  "\00:1\0"
  "b\0"
@@ -20,6 +20,11 @@
  "I did the rebase because he mentioned he wanted to get it into 3.20.\n"
  "\n"
  "Note that the conflicts were fairly trivial, so it's something we\n"
- could just ignore and let Linus handle the merge in the worst case.
+ "could just ignore and let Linus handle the merge in the worst case.\n"
+ "\n"
+ "_______________________________________________\n"
+ "xfs mailing list\n"
+ "xfs@oss.sgi.com\n"
+ http://oss.sgi.com/mailman/listinfo/xfs
 
-91136dff4a5e96f90aec662e05fb665d38dc2285a471a04e19e6fc831634b925
+839dcb44431c6f347bfb4bcc261256720b8b529a2c4842172f695b0ef7c0d3da
