diff for duplicates of <20160331105318.GC18910@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index cfd1ed2..a06aec2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,7 +6,7 @@ On Wed, Mar 30, 2016 at 09:46:23AM +0200, Ard Biesheuvel wrote:
 
 FWIW:
 
-Acked-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
+Acked-by: Will Deacon <will.deacon@arm.com>
 
 Yes, this is a temporary hack, but it's small, fixes a real issue and
 you're already working on a proper solution anyway.
@@ -48,8 +48,8 @@ Will
 > to move back to memblock_reserve() unconditionally.
 > 
 > Fixes: 4dffbfc48d65 ("arm64/efi: mark UEFI reserved regions as MEMBLOCK_NOMAP")
-> Reported-by: Mark Salter <msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
-> Signed-off-by: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+> Reported-by: Mark Salter <msalter@redhat.com>
+> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 > ---
 >  drivers/firmware/efi/arm-init.c | 18 +++++++++++++++---
 >  1 file changed, 15 insertions(+), 3 deletions(-)
@@ -87,6 +87,6 @@ Will
 > 
 > _______________________________________________
 > 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 0954a5e..094e9a3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,17 +1,8 @@
  "ref\01459323983-9120-1-git-send-email-ard.biesheuvel@linaro.org\0"
- "ref\01459323983-9120-1-git-send-email-ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0"
- "From\0Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>\0"
- "Subject\0Re: [PATCH] efi/arm64: don't apply MEMBLOCK_NOMAP to UEFI memory map mapping\0"
+ "From\0will.deacon@arm.com (Will Deacon)\0"
+ "Subject\0[PATCH] efi/arm64: don't apply MEMBLOCK_NOMAP to UEFI memory map mapping\0"
  "Date\0Thu, 31 Mar 2016 11:53:18 +0100\0"
- "To\0Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0"
- "Cc\0linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
-  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org
-  mark.rutland-5wv7dgnIgG8@public.gmane.org
-  mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
-  leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
-  jeremy.linton-5wv7dgnIgG8@public.gmane.org
- " msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, Mar 30, 2016 at 09:46:23AM +0200, Ard Biesheuvel wrote:\n"
@@ -22,7 +13,7 @@
  "\n"
  "FWIW:\n"
  "\n"
- "Acked-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>\n"
+ "Acked-by: Will Deacon <will.deacon@arm.com>\n"
  "\n"
  "Yes, this is a temporary hack, but it's small, fixes a real issue and\n"
  "you're already working on a proper solution anyway.\n"
@@ -64,8 +55,8 @@
  "> to move back to memblock_reserve() unconditionally.\n"
  "> \n"
  "> Fixes: 4dffbfc48d65 (\"arm64/efi: mark UEFI reserved regions as MEMBLOCK_NOMAP\")\n"
- "> Reported-by: Mark Salter <msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n"
- "> Signed-off-by: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "> Reported-by: Mark Salter <msalter@redhat.com>\n"
+ "> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>\n"
  "> ---\n"
  ">  drivers/firmware/efi/arm-init.c | 18 +++++++++++++++---\n"
  ">  1 file changed, 15 insertions(+), 3 deletions(-)\n"
@@ -103,8 +94,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"
  >
 
-5af4a1247a24c5c93b20d3babe1a7677611ae54f9f9bb4a0faf04f551aaf670f
+f55a6400d4061a42fed586db061da032ce96dac2737e28cf2a0192258734700a
