diff for duplicates of <20170811110406.00003346@huawei.com>

diff --git a/a/1.txt b/N1/1.txt
index 5bd71fb..133ee59 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,5 +1,5 @@
 On Tue, 8 Aug 2017 13:14:18 +0100
-Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> wrote:
+Robin Murphy <robin.murphy@arm.com> wrote:
 
 > On 08/08/17 12:18, Will Deacon wrote:
 > > On Tue, Jul 18, 2017 at 01:44:42PM +0100, Robin Murphy wrote:  
@@ -7,7 +7,7 @@ Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> wrote:
 > >> restore it as part of the necessary reset, resuming is trivial, and
 > >> there's nothing to do on suspend at all.
 > >>
-> >> Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
+> >> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
 > >> ---
 > >>  drivers/iommu/arm-smmu.c | 12 ++++++++++++
 > >>  1 file changed, 12 insertions(+)
@@ -58,5 +58,5 @@ Jonathan
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+> linux-arm-kernel at lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index f6e2181..c81e27d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,18 +2,14 @@
  "ref\0d8d6f3b606ed05d53b47d36e1c6a7f4b74eb3afc.1500381551.git.robin.murphy@arm.com\0"
  "ref\020170808111816.GD13355@arm.com\0"
  "ref\07d0d846b-8ada-6514-ec27-22f4d8487014@arm.com\0"
- "ref\07d0d846b-8ada-6514-ec27-22f4d8487014-5wv7dgnIgG8@public.gmane.org\0"
- "From\0Jonathan Cameron <Jonathan.Cameron-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>\0"
- "Subject\0Re: [PATCH 2/2] iommu/arm-smmu: Add system PM support\0"
+ "From\0Jonathan.Cameron@huawei.com (Jonathan Cameron)\0"
+ "Subject\0[PATCH 2/2] iommu/arm-smmu: Add system PM support\0"
  "Date\0Fri, 11 Aug 2017 11:04:06 +0100\0"
- "To\0Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\0"
- "Cc\0Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>"
-  iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, 8 Aug 2017 13:14:18 +0100\n"
- "Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> wrote:\n"
+ "Robin Murphy <robin.murphy@arm.com> wrote:\n"
  "\n"
  "> On 08/08/17 12:18, Will Deacon wrote:\n"
  "> > On Tue, Jul 18, 2017 at 01:44:42PM +0100, Robin Murphy wrote:  \n"
@@ -21,7 +17,7 @@
  "> >> restore it as part of the necessary reset, resuming is trivial, and\n"
  "> >> there's nothing to do on suspend at all.\n"
  "> >>\n"
- "> >> Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\n"
+ "> >> Signed-off-by: Robin Murphy <robin.murphy@arm.com>\n"
  "> >> ---\n"
  "> >>  drivers/iommu/arm-smmu.c | 12 ++++++++++++\n"
  "> >>  1 file changed, 12 insertions(+)\n"
@@ -72,7 +68,7 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
+ "> linux-arm-kernel at lists.infradead.org\n"
  > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-99f632baa659c39fe708b814f56d41cb962d7e022c87cec707ec43c1f5a43811
+9b8f54a4c86f9ac444c584dd6437a2ecb30fd601c5b3eb7c93b35b34bade2f3e
