diff for duplicates of <20181109002157.GK41183@google.com>

diff --git a/a/1.txt b/N1/1.txt
index 4ead491..b5dd8bf 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-On Tue, Nov 06, 2018@03:12:13PM +0800, AceLan Kao wrote:
+On Tue, Nov 06, 2018 at 03:12:13PM +0800, AceLan Kao wrote:
 > It leads to the power consumption raises to 2.2W during s2idle, while
 > it consumes less than 1W during long idle if put SK hynix nvme to D3
 > and then enter s2idle.
@@ -15,7 +15,7 @@ I'm not sure we want a quirk for this at all, since as Christoph
 points out, it doesn't fix a functional issue as the other uses of
 quirk_no_ata_d3() do.
 
->From your emails with Christoph, it sounds like this quirk is a
+From your emails with Christoph, it sounds like this quirk is a
 workaround for a firmware defect.  If we *do* end up wanting a quirk,
 the changelog should at least mention the firmware defect and maybe
 check whether it has been fixed.
@@ -24,7 +24,7 @@ check whether it has been fixed.
 > 0.13W ~ 0.15W during short/long idle, and the power consumption during
 > s2idle becomes 0.77W.
 > 
-> Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
+> Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
 > ---
 >  drivers/pci/quirks.c    | 1 +
 >  include/linux/pci_ids.h | 2 ++
@@ -59,5 +59,5 @@ check whether it has been fixed.
 > 
 > _______________________________________________
 > Linux-nvme mailing list
-> Linux-nvme at lists.infradead.org
+> Linux-nvme@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-nvme
diff --git a/a/content_digest b/N1/content_digest
index d8d9145..8a94466 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,18 @@
  "ref\020181106071214.12745-1-acelan.kao@canonical.com\0"
- "From\0helgaas@kernel.org (Bjorn Helgaas)\0"
- "Subject\0[PATCH v2 1/2] pci: prevent sk hynix nvme from entering D3\0"
+ "From\0Bjorn Helgaas <helgaas@kernel.org>\0"
+ "Subject\0Re: [PATCH v2 1/2] pci: prevent sk hynix nvme from entering D3\0"
  "Date\0Thu, 8 Nov 2018 18:21:57 -0600\0"
+ "To\0AceLan Kao <acelan.kao@canonical.com>\0"
+ "Cc\0Keith Busch <keith.busch@intel.com>"
+  Jens Axboe <axboe@fb.com>
+  Christoph Hellwig <hch@lst.de>
+  Sagi Grimberg <sagi@grimberg.me>
+  linux-nvme@lists.infradead.org
+  linux-kernel@vger.kernel.org
+ " linux-pci@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
- "On Tue, Nov 06, 2018@03:12:13PM +0800, AceLan Kao wrote:\n"
+ "On Tue, Nov 06, 2018 at 03:12:13PM +0800, AceLan Kao wrote:\n"
  "> It leads to the power consumption raises to 2.2W during s2idle, while\n"
  "> it consumes less than 1W during long idle if put SK hynix nvme to D3\n"
  "> and then enter s2idle.\n"
@@ -21,7 +29,7 @@
  "points out, it doesn't fix a functional issue as the other uses of\n"
  "quirk_no_ata_d3() do.\n"
  "\n"
- ">From your emails with Christoph, it sounds like this quirk is a\n"
+ "From your emails with Christoph, it sounds like this quirk is a\n"
  "workaround for a firmware defect.  If we *do* end up wanting a quirk,\n"
  "the changelog should at least mention the firmware defect and maybe\n"
  "check whether it has been fixed.\n"
@@ -30,7 +38,7 @@
  "> 0.13W ~ 0.15W during short/long idle, and the power consumption during\n"
  "> s2idle becomes 0.77W.\n"
  "> \n"
- "> Signed-off-by: AceLan Kao <acelan.kao at canonical.com>\n"
+ "> Signed-off-by: AceLan Kao <acelan.kao@canonical.com>\n"
  "> ---\n"
  ">  drivers/pci/quirks.c    | 1 +\n"
  ">  include/linux/pci_ids.h | 2 ++\n"
@@ -65,7 +73,7 @@
  "> \n"
  "> _______________________________________________\n"
  "> Linux-nvme mailing list\n"
- "> Linux-nvme at lists.infradead.org\n"
+ "> Linux-nvme@lists.infradead.org\n"
  > http://lists.infradead.org/mailman/listinfo/linux-nvme
 
-39a37713e424bc27ba528233ed857638b6b48a1baf96e6640b9ceb590fd6c888
+0c0a5b58991da5093e267a5cca2f96f3f093675600a88ca42e872a978b4cd662
