diff for duplicates of <20170411080122.v4gm3cogtrynm7nv@dell>

diff --git a/a/1.txt b/N1/1.txt
index 3dae5fc..d60bb5a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -25,10 +25,10 @@ I will get around to it shortly.
 > >>>
 > >>> This adds support for most of AXP20X and AXP22X ADCs.
 > >>>
-> >>> Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
-> >>> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-> >>> Acked-by: Chen-Yu Tsai <wens@csie.org>
-> >>> Reviewed-by: Jonathan Cameron <jic23@kernel.org>
+> >>> Signed-off-by: Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+> >>> Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+> >>> Acked-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
+> >>> Reviewed-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
 > >>> ---
 > >>>
 > >>> Lee, could you merge this through the mfd tree please?
@@ -125,7 +125,7 @@ I will get around to it shortly.
 > >>> +/* ADC driver for AXP20X and AXP22X PMICs
 > >>> + *
 > >>> + * Copyright (c) 2016 Free Electrons NextThing Co.
-> >>> + *	Quentin Schulz <quentin.schulz@free-electrons.com>
+> >>> + *	Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.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 published by the
@@ -737,7 +737,7 @@ I will get around to it shortly.
 > >>> +module_platform_driver(axp20x_adc_driver);
 > >>> +
 > >>> +MODULE_DESCRIPTION("ADC driver for AXP20X and AXP22X PMICs");
-> >>> +MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
+> >>> +MODULE_AUTHOR("Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>");
 > >>> +MODULE_LICENSE("GPL");
 > >>>
 > >>
@@ -748,4 +748,9 @@ I will get around to it shortly.
 Lee Jones
 Linaro STMicroelectronics Landing Team Lead
 Linaro.org │ Open source software for ARM SoCs
-Follow Linaro: Facebook | Twitter | Blog
\ No newline at end of file
+Follow Linaro: Facebook | Twitter | Blog
+
+-- 
+You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
+To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
+For more options, visit https://groups.google.com/d/optout.
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 43dfffd..28d4d37 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,7 +11,10 @@
   "ref\0001800d928-d804-71db-cd0b-ec79cc504ee6\@free-electrons.com\0"
 ]
 [
-  "From\0Lee Jones <lee.jones\@linaro.org>\0"
+  "ref\0001800d928-d804-71db-cd0b-ec79cc504ee6-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org\0"
+]
+[
+  "From\0Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
 ]
 [
   "Subject\0Re: [RESEND PATCH v4] iio: adc: add support for X-Powers AXP20X and AXP22X PMICs ADCs\0"
@@ -20,28 +23,28 @@
   "Date\0Tue, 11 Apr 2017 09:01:22 +0100\0"
 ]
 [
-  "To\0Quentin Schulz <quentin.schulz\@free-electrons.com>\0"
+  "To\0Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\0"
 ]
 [
-  "Cc\0sre\@kernel.org",
-  " robh+dt\@kernel.org",
-  " mark.rutland\@arm.com",
-  " wens\@csie.org",
-  " linux\@armlinux.org.uk",
-  " maxime.ripard\@free-electrons.com",
-  " jic23\@kernel.org",
-  " knaack.h\@gmx.de",
-  " lars\@metafoo.de",
-  " pmeerw\@pmeerw.net",
-  " icenowy\@aosc.xyz",
-  " thomas.petazzoni\@free-electrons.com",
-  " devicetree\@vger.kernel.org",
-  " linux-pm\@vger.kernel.org",
-  " linux-iio\@vger.kernel.org",
-  " linux-kernel\@vger.kernel.org",
-  " linux-sunxi\@googlegroups.com",
-  " liam\@networkimprov.net",
-  " linux-arm-kernel\@lists.infradead.org\0"
+  "Cc\0sre-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org",
+  " robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org",
+  " mark.rutland-5wv7dgnIgG8\@public.gmane.org",
+  " wens-jdAy2FN1RRM\@public.gmane.org",
+  " linux-I+IVW8TIWO2tmTQ+vhA3Yw\@public.gmane.org",
+  " maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org",
+  " jic23-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org",
+  " knaack.h-Mmb7MZpHnFY\@public.gmane.org",
+  " lars-Qo5EllUWu/uELgA04lAiVw\@public.gmane.org",
+  " pmeerw-jW+XmwGofnusTnJN9+BGXg\@public.gmane.org",
+  " icenowy-ymACFijhrKM\@public.gmane.org",
+  " thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org",
+  " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-pm-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-iio-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw\@public.gmane.org",
+  " liam-RYWXG+zxWwBdeoIcmNTgJF6hYfS7NtTn\@public.gmane.org",
+  " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
 ]
 [
   "\0000:1\0"
@@ -77,10 +80,10 @@
   "> >>>\n",
   "> >>> This adds support for most of AXP20X and AXP22X ADCs.\n",
   "> >>>\n",
-  "> >>> Signed-off-by: Quentin Schulz <quentin.schulz\@free-electrons.com>\n",
-  "> >>> Acked-by: Maxime Ripard <maxime.ripard\@free-electrons.com>\n",
-  "> >>> Acked-by: Chen-Yu Tsai <wens\@csie.org>\n",
-  "> >>> Reviewed-by: Jonathan Cameron <jic23\@kernel.org>\n",
+  "> >>> Signed-off-by: Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\n",
+  "> >>> Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\n",
+  "> >>> Acked-by: Chen-Yu Tsai <wens-jdAy2FN1RRM\@public.gmane.org>\n",
+  "> >>> Reviewed-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>\n",
   "> >>> ---\n",
   "> >>>\n",
   "> >>> Lee, could you merge this through the mfd tree please?\n",
@@ -177,7 +180,7 @@
   "> >>> +/* ADC driver for AXP20X and AXP22X PMICs\n",
   "> >>> + *\n",
   "> >>> + * Copyright (c) 2016 Free Electrons NextThing Co.\n",
-  "> >>> + *\tQuentin Schulz <quentin.schulz\@free-electrons.com>\n",
+  "> >>> + *\tQuentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\n",
   "> >>> + *\n",
   "> >>> + * This program is free software; you can redistribute it and/or modify it under\n",
   "> >>> + * the terms of the GNU General Public License version 2 as published by the\n",
@@ -789,7 +792,7 @@
   "> >>> +module_platform_driver(axp20x_adc_driver);\n",
   "> >>> +\n",
   "> >>> +MODULE_DESCRIPTION(\"ADC driver for AXP20X and AXP22X PMICs\");\n",
-  "> >>> +MODULE_AUTHOR(\"Quentin Schulz <quentin.schulz\@free-electrons.com>\");\n",
+  "> >>> +MODULE_AUTHOR(\"Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\");\n",
   "> >>> +MODULE_LICENSE(\"GPL\");\n",
   "> >>>\n",
   "> >>\n",
@@ -800,7 +803,12 @@
   "Lee Jones\n",
   "Linaro STMicroelectronics Landing Team Lead\n",
   "Linaro.org \342\224\202 Open source software for ARM SoCs\n",
-  "Follow Linaro: Facebook | Twitter | Blog"
+  "Follow Linaro: Facebook | Twitter | Blog\n",
+  "\n",
+  "-- \n",
+  "You received this message because you are subscribed to the Google Groups \"linux-sunxi\" group.\n",
+  "To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0\@public.gmane.org\n",
+  "For more options, visit https://groups.google.com/d/optout."
 ]
 
-11cef35dc6256d19215a6d7a31ba5e2300aea5c4009ebf087e899de9c3109e63
+8532afcca7de45f0d8463f1f0f21e80106b3afd3f3bb21fd0b51edec8744f8d8
