diff for duplicates of <20161115194404.GA5138@localhost.localdomain>

diff --git a/a/1.txt b/N1/1.txt
index 4484dc8..346ce47 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,15 +1,15 @@
-On Tue, Nov 15, 2016 at 11:11:58AM -0800, Omar Sandoval wrote:
-> From: Omar Sandoval <osandov@fb.com>
+On Tue, Nov 15, 2016@11:11:58AM -0800, Omar Sandoval wrote:
+> From: Omar Sandoval <osandov at fb.com>
 > 
 > Let's not depend on any of the BLK_MQ_RQ_QUEUE_* constants having
 > specific values. No functional change.
 >
-> Signed-off-by: Omar Sandoval <osandov@fb.com>
+> Signed-off-by: Omar Sandoval <osandov at fb.com>
 
 Yeah, we've been depending on the values of BLK_MQ_RQ_QUEUE_[ERROR|BUSY]
 not being zero without this. Looks good.
 
-Reviewed-by: Keith Busch <keith.busch@intel.com>
+Reviewed-by: Keith Busch <keith.busch at intel.com>
 
 > ---
 >  drivers/nvme/host/core.c   | 4 ++--
@@ -124,5 +124,5 @@ Reviewed-by: Keith Busch <keith.busch@intel.com>
 > 
 > _______________________________________________
 > Linux-nvme mailing list
-> Linux-nvme@lists.infradead.org
+> Linux-nvme at lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-nvme
diff --git a/a/content_digest b/N1/content_digest
index dee91e7..ff60b1b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,26 +1,21 @@
  "ref\0ec8930a71efdc30f9d5e5c69954f5b10cfab9927.1479236597.git.osandov@fb.com\0"
- "From\0Keith Busch <keith.busch@intel.com>\0"
- "Subject\0Re: [PATCH 1/2] nvme: untangle 0 and BLK_MQ_RQ_QUEUE_OK\0"
+ "From\0keith.busch@intel.com (Keith Busch)\0"
+ "Subject\0[PATCH 1/2] nvme: untangle 0 and BLK_MQ_RQ_QUEUE_OK\0"
  "Date\0Tue, 15 Nov 2016 14:44:04 -0500\0"
- "To\0Omar Sandoval <osandov@osandov.com>\0"
- "Cc\0linux-block@vger.kernel.org"
-  kernel-team@fb.com
-  linux-scsi@vger.kernel.org
- " linux-nvme@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
- "On Tue, Nov 15, 2016 at 11:11:58AM -0800, Omar Sandoval wrote:\n"
- "> From: Omar Sandoval <osandov@fb.com>\n"
+ "On Tue, Nov 15, 2016@11:11:58AM -0800, Omar Sandoval wrote:\n"
+ "> From: Omar Sandoval <osandov at fb.com>\n"
  "> \n"
  "> Let's not depend on any of the BLK_MQ_RQ_QUEUE_* constants having\n"
  "> specific values. No functional change.\n"
  ">\n"
- "> Signed-off-by: Omar Sandoval <osandov@fb.com>\n"
+ "> Signed-off-by: Omar Sandoval <osandov at fb.com>\n"
  "\n"
  "Yeah, we've been depending on the values of BLK_MQ_RQ_QUEUE_[ERROR|BUSY]\n"
  "not being zero without this. Looks good.\n"
  "\n"
- "Reviewed-by: Keith Busch <keith.busch@intel.com>\n"
+ "Reviewed-by: Keith Busch <keith.busch at intel.com>\n"
  "\n"
  "> ---\n"
  ">  drivers/nvme/host/core.c   | 4 ++--\n"
@@ -135,7 +130,7 @@
  "> \n"
  "> _______________________________________________\n"
  "> Linux-nvme mailing list\n"
- "> Linux-nvme@lists.infradead.org\n"
+ "> Linux-nvme at lists.infradead.org\n"
  > http://lists.infradead.org/mailman/listinfo/linux-nvme
 
-8afe3ad66a347b581a93703071d7b8b701eb4c1a1b11f617c174a7de1908697d
+30d8e6245590d7f0647de988967e92d4d54e3e83510191cd8710f399c5642b57
