diff for duplicates of <d9cecce96aa531b83f58b38df827e38ba1618858.1493812478.git-series.maxime.ripard@free-electrons.com>

diff --git a/a/1.txt b/N1/1.txt
index 936b04f..bbc0405 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,8 +1,8 @@
 While all functions have debug logs, the channel enable and disable are not
 logged. Make sure this is the case.
 
-Acked-by: Chen-Yu Tsai <wens@csie.org>
-Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Acked-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
+Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
 ---
  drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 ++++
  1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/a/content_digest b/N1/content_digest
index 65b6330..d887396 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,10 @@
   "ref\0cover.d697f34bb7b0605c5e76cbc4167a64453e5e0984.1493812478.git-series.maxime.ripard\@free-electrons.com\0"
 ]
 [
-  "From\0Maxime Ripard <maxime.ripard\@free-electrons.com>\0"
+  "ref\0cover.d697f34bb7b0605c5e76cbc4167a64453e5e0984.1493812478.git-series.maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org\0"
+]
+[
+  "From\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\0"
 ]
 [
   "Subject\0[PATCH v2 9/20] drm/sun4i: tcon: Add channel debug\0"
@@ -11,22 +14,22 @@
   "Date\0Wed,  3 May 2017 13:59:46 +0200\0"
 ]
 [
-  "To\0Mike Turquette <mturquette\@baylibre.com>",
-  " Stephen Boyd <sboyd\@codeaurora.org>",
-  " Chen-Yu Tsai <wens\@csie.org>",
-  " Maxime Ripard <maxime.ripard\@free-electrons.com>\0"
+  "To\0Mike Turquette <mturquette-rdvid1DuHRBWk0Htik3J/w\@public.gmane.org>",
+  " Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ\@public.gmane.org>",
+  " Chen-Yu Tsai <wens-jdAy2FN1RRM\@public.gmane.org>",
+  " Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\0"
 ]
 [
-  "Cc\0Daniel Vetter <daniel.vetter\@intel.com>",
-  " David Airlie <airlied\@linux.ie>",
-  " dri-devel\@lists.freedesktop.org",
-  " Mark Rutland <mark.rutland\@arm.com>",
-  " Rob Herring <robh+dt\@kernel.org>",
-  " devicetree\@vger.kernel.org",
-  " linux-arm-kernel\@lists.infradead.org",
-  " linux-clk\@vger.kernel.org",
-  " linux-kernel\@vger.kernel.org",
-  " linux-sunxi\@googlegroups.com\0"
+  "Cc\0Daniel Vetter <daniel.vetter-ral2JQCrhuEAvxtiuMwx3w\@public.gmane.org>",
+  " David Airlie <airlied-cv59FeDIM0c\@public.gmane.org>",
+  " dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW\@public.gmane.org",
+  " Mark Rutland <mark.rutland-5wv7dgnIgG8\@public.gmane.org>",
+  " Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+  " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+  " linux-clk-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+  " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw\@public.gmane.org\0"
 ]
 [
   "\0000:1\0"
@@ -38,8 +41,8 @@
   "While all functions have debug logs, the channel enable and disable are not\n",
   "logged. Make sure this is the case.\n",
   "\n",
-  "Acked-by: Chen-Yu Tsai <wens\@csie.org>\n",
-  "Signed-off-by: Maxime Ripard <maxime.ripard\@free-electrons.com>\n",
+  "Acked-by: Chen-Yu Tsai <wens-jdAy2FN1RRM\@public.gmane.org>\n",
+  "Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\n",
   "---\n",
   " drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 ++++\n",
   " 1 file changed, 4 insertions(+), 0 deletions(-)\n",
@@ -70,4 +73,4 @@
   "git-series 0.8.11"
 ]
 
-502d24b357118702a603aaad83794f63f576768fda6dad92b9cb112b2c7a68e6
+45c604358b824e1baf0965a3a056745ff1bbffa95f5f564f479f58b340f72f5f
