diff for duplicates of <CADyBb7tZ35tAESxv+dkO_Fam87ZgJR=Agzms+M8VAmrOsgK9tg@mail.gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index db85431..dc75d22 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,8 +1,8 @@
 Hi Lorenzo,
 
-On 28 March 2017 at 19:35, Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org> wrote:
-> On Wed, Mar 22, 2017 at 12:31:18AM +0800, fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org wrote:
->> From: Fu Wei <fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+On 28 March 2017 at 19:35, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> wrote:
+> On Wed, Mar 22, 2017 at 12:31:18AM +0800, fu.wei@linaro.org wrote:
+>> From: Fu Wei <fu.wei@linaro.org>
 >>
 >> This patch adds support for parsing arch timer info in GTDT,
 >> provides some kernel APIs to parse all the PPIs and
@@ -11,17 +11,17 @@ On 28 March 2017 at 19:35, Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@publ
 >> By this driver, we can simplify arm_arch_timer drivers, and
 >> separate the ACPI GTDT knowledge from it.
 >>
->> Signed-off-by: Fu Wei <fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
->> Signed-off-by: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
->> Acked-by: Rafael J. Wysocki <rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
+>> Signed-off-by: Fu Wei <fu.wei@linaro.org>
+>> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
+>> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 >
-> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org>
+> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 >
 > Some nits below.
 >
->> Tested-by: Xiongfeng Wang <wangxiongfeng2-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
->> Reviewed-by: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
->> Tested-by: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+>> Tested-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
+>> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
+>> Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
 >> ---
 >>  arch/arm64/Kconfig          |   1 +
 >>  drivers/acpi/arm64/Kconfig  |   3 +
@@ -70,9 +70,9 @@ On 28 March 2017 at 19:35, Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@publ
 >> + * ARM Specific GTDT table Support
 >> + *
 >> + * Copyright (C) 2016, Linaro Ltd.
->> + * Author: Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
->> + *         Fu Wei <fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
->> + *         Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+>> + * Author: Daniel Lezcano <daniel.lezcano@linaro.org>
+>> + *         Fu Wei <fu.wei@linaro.org>
+>> + *         Hanjun Guo <hanjun.guo@linaro.org>
 >> + *
 >> + * This program is free software; you can redistribute it and/or modify
 >> + * it under the terms of the GNU General Public License version 2 as
@@ -336,8 +336,4 @@ Best regards,
 
 Fu Wei
 Software Engineer
-Red Hat
---
-To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
-the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
+Red Hat
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index b37aa1a..d731b22 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "ref\00020170328113535.GA17440\@red-moon\0"
 ]
 [
-  "From\0Fu Wei <fu.wei-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
+  "From\0Fu Wei <fu.wei\@linaro.org>\0"
 ]
 [
   "Subject\0Re: [PATCH v22 07/11] acpi/arm64: Add GTDT table parse driver\0"
@@ -17,30 +17,41 @@
   "Date\0Wed, 29 Mar 2017 22:29:33 +0800\0"
 ]
 [
-  "To\0Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org>\0"
+  "To\0Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>\0"
 ]
 [
-  "Cc\0Rafael J. Wysocki <rjw-LthD3rsA81gm4RdzfppkhA\@public.gmane.org>",
-  " Len Brown <lenb-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
-  " Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ\@public.gmane.org>",
-  " Marc Zyngier <marc.zyngier-5wv7dgnIgG8\@public.gmane.org>",
-  " Mark Rutland <mark.rutland-5wv7dgnIgG8\@public.gmane.org>",
-  " Sudeep Holla <sudeep.holla-5wv7dgnIgG8\@public.gmane.org>",
-  " Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
-  " Linaro ACPI Mailman List <linaro-acpi-cunTk1MwBs8s++Sfvej+rw\@public.gmane.org>",
-  " Linux Kernel Mailing List <linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org>",
-  " ACPI Devel Maling List <linux-acpi-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org>",
-  " rruigrok-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org",
+  "Cc\0Rafael J. Wysocki <rjw\@rjwysocki.net>",
+  " Len Brown <lenb\@kernel.org>",
+  " Daniel Lezcano <daniel.lezcano\@linaro.org>",
+  " Thomas Gleixner <tglx\@linutronix.de>",
+  " Marc Zyngier <marc.zyngier\@arm.com>",
+  " Mark Rutland <mark.rutland\@arm.com>",
+  " Sudeep Holla <sudeep.holla\@arm.com>",
+  " Hanjun Guo <hanjun.guo\@linaro.org>",
+  " linux-arm-kernel\@lists.infradead.org",
+  " Linaro ACPI Mailman List <linaro-acpi\@lists.linaro.org>",
+  " Linux Kernel Mailing List <linux-kernel\@vger.kernel.org>",
+  " ACPI Devel Maling List <linux-acpi\@vger.kernel.org>",
+  " rruigrok\@codeaurora.org",
   " Abdulhamid",
-  " Harb <harba-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
-  " Christopher Covington <cov-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
-  " Timur Tabi <timur-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
-  " G Gregory <graeme.gregory-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " Al Stone <al.stone-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " Jon Masters <jcm-H+wXaHxf7aLQT0dZR+AlfA\@public.gmane.org>",
-  " Wei\0"
+  " Harb <harba\@codeaurora.org>",
+  " Christopher Covington <cov\@codeaurora.org>",
+  " Timur Tabi <timur\@codeaurora.org>",
+  " G Gregory <graeme.gregory\@linaro.org>",
+  " Al Stone <al.stone\@linaro.org>",
+  " Jon Masters <jcm\@redhat.com>",
+  " Wei Huang <wei\@redhat.com>",
+  " Arnd Bergmann <arnd\@arndb.de>",
+  " Catalin Marinas <catalin.marinas\@arm.com>",
+  " Will Deacon <will.deacon\@arm.com>",
+  " Suravee Suthikulpanit <Suravee.Suthikulpanit\@amd.com>",
+  " Leo Duran <leo.duran\@amd.com>",
+  " Wim Van Sebroeck <wim\@iguana.be>",
+  " Guenter Roeck <linux\@roeck-us.net>",
+  " linux-watchdog\@vger.kernel.org",
+  " Tomasz Nowicki <tn\@semihalf.com>",
+  " Christoffer Dall <christoffer.dall\@linaro.org>",
+  " Julien Grall <julien.grall\@arm.com>\0"
 ]
 [
   "\0000:1\0"
@@ -51,9 +62,9 @@
 [
   "Hi Lorenzo,\n",
   "\n",
-  "On 28 March 2017 at 19:35, Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org> wrote:\n",
-  "> On Wed, Mar 22, 2017 at 12:31:18AM +0800, fu.wei-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org wrote:\n",
-  ">> From: Fu Wei <fu.wei-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
+  "On 28 March 2017 at 19:35, Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com> wrote:\n",
+  "> On Wed, Mar 22, 2017 at 12:31:18AM +0800, fu.wei\@linaro.org wrote:\n",
+  ">> From: Fu Wei <fu.wei\@linaro.org>\n",
   ">>\n",
   ">> This patch adds support for parsing arch timer info in GTDT,\n",
   ">> provides some kernel APIs to parse all the PPIs and\n",
@@ -62,17 +73,17 @@
   ">> By this driver, we can simplify arm_arch_timer drivers, and\n",
   ">> separate the ACPI GTDT knowledge from it.\n",
   ">>\n",
-  ">> Signed-off-by: Fu Wei <fu.wei-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
-  ">> Signed-off-by: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
-  ">> Acked-by: Rafael J. Wysocki <rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>\n",
+  ">> Signed-off-by: Fu Wei <fu.wei\@linaro.org>\n",
+  ">> Signed-off-by: Hanjun Guo <hanjun.guo\@linaro.org>\n",
+  ">> Acked-by: Rafael J. Wysocki <rafael.j.wysocki\@intel.com>\n",
   ">\n",
-  "> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org>\n",
+  "> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>\n",
   ">\n",
   "> Some nits below.\n",
   ">\n",
-  ">> Tested-by: Xiongfeng Wang <wangxiongfeng2-hv44wF8Li93QT0dZR+AlfA\@public.gmane.org>\n",
-  ">> Reviewed-by: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
-  ">> Tested-by: Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
+  ">> Tested-by: Xiongfeng Wang <wangxiongfeng2\@huawei.com>\n",
+  ">> Reviewed-by: Hanjun Guo <hanjun.guo\@linaro.org>\n",
+  ">> Tested-by: Hanjun Guo <hanjun.guo\@linaro.org>\n",
   ">> ---\n",
   ">>  arch/arm64/Kconfig          |   1 +\n",
   ">>  drivers/acpi/arm64/Kconfig  |   3 +\n",
@@ -121,9 +132,9 @@
   ">> + * ARM Specific GTDT table Support\n",
   ">> + *\n",
   ">> + * Copyright (C) 2016, Linaro Ltd.\n",
-  ">> + * Author: Daniel Lezcano <daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
-  ">> + *         Fu Wei <fu.wei-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
-  ">> + *         Hanjun Guo <hanjun.guo-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\n",
+  ">> + * Author: Daniel Lezcano <daniel.lezcano\@linaro.org>\n",
+  ">> + *         Fu Wei <fu.wei\@linaro.org>\n",
+  ">> + *         Hanjun Guo <hanjun.guo\@linaro.org>\n",
   ">> + *\n",
   ">> + * This program is free software; you can redistribute it and/or modify\n",
   ">> + * it under the terms of the GNU General Public License version 2 as\n",
@@ -387,11 +398,7 @@
   "\n",
   "Fu Wei\n",
   "Software Engineer\n",
-  "Red Hat\n",
-  "--\n",
-  "To unsubscribe from this list: send the line \"unsubscribe linux-watchdog\" in\n",
-  "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\n",
-  "More majordomo info at  http://vger.kernel.org/majordomo-info.html"
+  "Red Hat"
 ]
 
-88a695b8ccd41533a588f1f98e76224a65b3736d433257c0d05387606aa6f6a6
+59e336651cbc4db20be68c6fb7d1f4dd11f705e0995cc2c064f3988aa7330eea
