diff for duplicates of <150846719726.24336.3564801642993121646.stgit@dwillia2-desk3.amr.corp.intel.com>
diff --git a/a/1.txt b/N1/1.txt
index debae34..8353d6f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -42,9 +42,4 @@ index 13dab191a23e..eace2c5396a7 100644
+ if (ctx && !list_empty_careful(&ctx->flc_lease))
return __break_lease(inode,
wait ? O_WRONLY : O_WRONLY | O_NONBLOCK,
- FL_LAYOUT);
-
-_______________________________________________
-Linux-nvdimm mailing list
-Linux-nvdimm@lists.01.org
-https://lists.01.org/mailman/listinfo/linux-nvdimm
\ No newline at end of file
+ FL_LAYOUT);
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 0666d52..b0f75cb 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,15 +14,16 @@
"To\0akpm\@linux-foundation.org\0"
]
[
- "Cc\0J. Bruce Fields <bfields\@fieldses.org>",
+ "Cc\0linux-xfs\@vger.kernel.org",
" linux-nvdimm\@lists.01.org",
" linux-kernel\@vger.kernel.org",
- " linux-xfs\@vger.kernel.org",
+ " hch\@lst.de",
+ " J. Bruce Fields <bfields\@fieldses.org>",
" linux-mm\@kvack.org",
" Alexander Viro <viro\@zeniv.linux.org.uk>",
" linux-fsdevel\@vger.kernel.org",
" Jeff Layton <jlayton\@poochiereds.net>",
- " hch\@lst.de\0"
+ " Ross Zwisler <ross.zwisler\@linux.intel.com>\0"
]
[
"\0000:1\0"
@@ -75,12 +76,7 @@
"+\tif (ctx && !list_empty_careful(&ctx->flc_lease))\n",
" \t\treturn __break_lease(inode,\n",
" \t\t\t\twait ? O_WRONLY : O_WRONLY | O_NONBLOCK,\n",
- " \t\t\t\tFL_LAYOUT);\n",
- "\n",
- "_______________________________________________\n",
- "Linux-nvdimm mailing list\n",
- "Linux-nvdimm\@lists.01.org\n",
- "https://lists.01.org/mailman/listinfo/linux-nvdimm"
+ " \t\t\t\tFL_LAYOUT);"
]
-7179dd4e3d97012ef20bb4e1404f56770ec6e6e4f4cc793600537a8da28daeb1
+cb2e119b9c5a01d25363ef713807f6f43f0bfa72de02b23fc117ce89748321cf
diff --git a/a/1.txt b/N2/1.txt
index debae34..0952356 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -44,7 +44,8 @@ index 13dab191a23e..eace2c5396a7 100644
wait ? O_WRONLY : O_WRONLY | O_NONBLOCK,
FL_LAYOUT);
-_______________________________________________
-Linux-nvdimm mailing list
-Linux-nvdimm@lists.01.org
-https://lists.01.org/mailman/listinfo/linux-nvdimm
\ No newline at end of file
+--
+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/ .
+Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 0666d52..a36fa52 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -14,15 +14,16 @@
"To\0akpm\@linux-foundation.org\0"
]
[
- "Cc\0J. Bruce Fields <bfields\@fieldses.org>",
+ "Cc\0linux-xfs\@vger.kernel.org",
" linux-nvdimm\@lists.01.org",
" linux-kernel\@vger.kernel.org",
- " linux-xfs\@vger.kernel.org",
+ " hch\@lst.de",
+ " J. Bruce Fields <bfields\@fieldses.org>",
" linux-mm\@kvack.org",
" Alexander Viro <viro\@zeniv.linux.org.uk>",
" linux-fsdevel\@vger.kernel.org",
" Jeff Layton <jlayton\@poochiereds.net>",
- " hch\@lst.de\0"
+ " Ross Zwisler <ross.zwisler\@linux.intel.com>\0"
]
[
"\0000:1\0"
@@ -77,10 +78,11 @@
" \t\t\t\twait ? O_WRONLY : O_WRONLY | O_NONBLOCK,\n",
" \t\t\t\tFL_LAYOUT);\n",
"\n",
- "_______________________________________________\n",
- "Linux-nvdimm mailing list\n",
- "Linux-nvdimm\@lists.01.org\n",
- "https://lists.01.org/mailman/listinfo/linux-nvdimm"
+ "--\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",
+ "Don't email: <a href=mailto:\"dont\@kvack.org\"> email\@kvack.org </a>"
]
-7179dd4e3d97012ef20bb4e1404f56770ec6e6e4f4cc793600537a8da28daeb1
+43cdcae7faa420c0fbfc6979ec1686192b57dbe321e6e2df8d2d3be4994890c8
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.