diff for duplicates of <20150910095208.GA29293@leverpostej>

diff --git a/a/1.txt b/N1/1.txt
index a6bd051..0b4ae96 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ I'm not necessarily opposed to the renaming, but I think that this is
 the least important thing to standardize for this to work.
 
 On Thu, Sep 10, 2015 at 09:41:56AM +0100, Shannon Zhao wrote:
-> From: Shannon Zhao <shannon.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+> From: Shannon Zhao <shannon.zhao@linaro.org>
 > 
 > These EFI stub parameters are used to internal communication between EFI
 > stub and Linux kernel and EFI stub creates these parameters. But for Xen
@@ -41,7 +41,7 @@ That at least includes the following:
 For the moment this is true, but will not be once we have kexec, so
 there's a dependency (or anti-dependency) there.
 
-> Signed-off-by: Shannon Zhao <shannon.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
 > ---
 > Look at [1] for the discussion about this in Xen ML. The purpose of this
 > patch is to standardize the names to make Linux ARM kernel work on Xen
@@ -164,6 +164,6 @@ Mark.
 > 
 > _______________________________________________
 > 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 06f0490..02fadc3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,25 +1,8 @@
  "ref\01441874516-11364-1-git-send-email-zhaoshenglong@huawei.com\0"
- "ref\01441874516-11364-1-git-send-email-zhaoshenglong-hv44wF8Li93QT0dZR+AlfA@public.gmane.org\0"
- "From\0Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>\0"
- "Subject\0Re: [PATCH] efi/libstub/fdt: Standardize the names of EFI stub parameters\0"
+ "From\0mark.rutland@arm.com (Mark Rutland)\0"
+ "Subject\0[PATCH] efi/libstub/fdt: Standardize the names of EFI stub parameters\0"
  "Date\0Thu, 10 Sep 2015 10:52:09 +0100\0"
- "To\0Shannon Zhao <zhaoshenglong-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>\0"
- "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>"
-  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  Ian.Campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org <Ian.Campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>
-  linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org <leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-  xen-devel-GuqFBffKawuEi8DpZVb4nw@public.gmane.org <xen-devel-GuqFBffKawuEi8DpZVb4nw@public.gmane.org>
-  julien.grall-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org <julien.grall-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org>
-  freebsd-arm-h+KGxgPPiopAfugRpC6u6w@public.gmane.org <freebsd-arm-h+KGxgPPiopAfugRpC6u6w@public.gmane.org>
-  matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
-  christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org <christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-  jbeulich-IBi9RG/b67k@public.gmane.org <jbeulich-IBi9RG/b67k@public.gmane.org>
-  peter.huangpeng-hv44wF8Li93QT0dZR+AlfA@public.gmane.org <peter.huangpeng-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
- " stefano.stabellini-mvvWK6WmYck@public.gmane.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi,\n"
@@ -28,7 +11,7 @@
  "the least important thing to standardize for this to work.\n"
  "\n"
  "On Thu, Sep 10, 2015 at 09:41:56AM +0100, Shannon Zhao wrote:\n"
- "> From: Shannon Zhao <shannon.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "> From: Shannon Zhao <shannon.zhao@linaro.org>\n"
  "> \n"
  "> These EFI stub parameters are used to internal communication between EFI\n"
  "> stub and Linux kernel and EFI stub creates these parameters. But for Xen\n"
@@ -65,7 +48,7 @@
  "For the moment this is true, but will not be once we have kexec, so\n"
  "there's a dependency (or anti-dependency) there.\n"
  "\n"
- "> Signed-off-by: Shannon Zhao <shannon.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>\n"
  "> ---\n"
  "> Look at [1] for the discussion about this in Xen ML. The purpose of this\n"
  "> patch is to standardize the names to make Linux ARM kernel work on Xen\n"
@@ -188,8 +171,8 @@
  "> \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\n"
  >
 
-cd91c234d18fa57053f772900910ae55cb5f45434f982075dc5d7a4c321a31e1
+3e3e1fabb7cb86f825896f7445680e289d4e93a86bcbc65f5e5736ec933a685e
