diff for duplicates of <20150829223156.GD26895@dastard>

diff --git a/a/1.txt b/N1/1.txt
index b2bbb82..d25233f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -442,8 +442,3 @@ index abc2ccb..ab4b98c 100644
  		lip->li_ops->iop_format(lip, lv);
  insert:
  		ASSERT(lv->lv_buf_len <= nbytes);
-
-_______________________________________________
-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 3bdc91e..31e6753 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,8 +5,8 @@
  "Subject\0Re: Possible memory allocation deadlock in kmem_alloc and hung task in xfs_log_commit_cil and xlog_cil_push\0"
  "Date\0Sun, 30 Aug 2015 08:31:56 +1000\0"
  "To\0Gavin Guo <gavin.guo@canonical.com>\0"
- "Cc\0linux-kernel <linux-kernel@vger.kernel.org>"
- " xfs@oss.sgi.com\0"
+ "Cc\0xfs@oss.sgi.com"
+ " linux-kernel <linux-kernel@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
  "On Fri, Aug 28, 2015 at 08:54:04PM +0800, Gavin Guo wrote:\n"
@@ -452,11 +452,6 @@
  "-\n"
  " \t\tlip->li_ops->iop_format(lip, lv);\n"
  " insert:\n"
- " \t\tASSERT(lv->lv_buf_len <= nbytes);\n"
- "\n"
- "_______________________________________________\n"
- "xfs mailing list\n"
- "xfs@oss.sgi.com\n"
- http://oss.sgi.com/mailman/listinfo/xfs
+ " \t\tASSERT(lv->lv_buf_len <= nbytes);"
 
-8db4850d9f4565f3b101d6fbfbe2650fa3df1a018ec46ddeebf3bb7e5e159a2a
+7a55540bbe768a43130b7133d2d96d4cec7ce9b89d9051348371208d4bcee123
