diff for duplicates of <20180220104542.32286-1-marcus.folkesson@gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index d0211e3..12142fb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -336,7 +336,7 @@ index 88c05d0448b2..f4050a229eb5 100644
  /*
   * Watchdog driver for Atmel AT91SAM9x processors.
   *
-  * Copyright (C) 2008 Renaud CERRATO r.cerrato at til-technologies.fr
+  * Copyright (C) 2008 Renaud CERRATO r.cerrato@til-technologies.fr
   *
 - * This program is free software; you can redistribute it and/or
 - * modify it under the terms of the GNU General Public License
@@ -993,7 +993,7 @@ index 950c71a8bb22..c254cbb301a1 100644
   *	i6300esb:	Watchdog timer driver for Intel 6300ESB chipset
   *
   *	(c) Copyright 2004 Google Inc.
-  *	(c) Copyright 2005 David H?rdeman <david@2gen.com>
+  *	(c) Copyright 2005 David Härdeman <david@2gen.com>
   *
 - *	This program is free software; you can redistribute it and/or
 - *	modify it under the terms of the GNU General Public License
@@ -2187,7 +2187,7 @@ index b72ce68eacd3..1b7bfe15713c 100644
 +// SPDX-License-Identifier: GPL-2.0+
  /*
   * PC Watchdog Driver
-  * by Ken Hollis (khollis at bitgate.com)
+  * by Ken Hollis (khollis@bitgate.com)
 diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
 index 1f78f0908621..134a5c53a050 100644
 --- a/drivers/watchdog/pcwd_pci.c
@@ -2440,7 +2440,7 @@ index aba53424605e..2f343609f8e9 100644
 +// SPDX-License-Identifier: GPL-2.0+
  /* riowd.c - driver for hw watchdog inside Super I/O of RIO
   *
-  * Copyright (C) 2001, 2008 David S. Miller (davem at davemloft.net)
+  * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net)
 diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c
 index e60f55702ab7..9111909fde24 100644
 --- a/drivers/watchdog/rn5t618_wdt.c
@@ -2490,7 +2490,7 @@ index d001c17ddfde..4f4411cab9b7 100644
  /*
   * Realtek RTD129x watchdog
   *
-  * Copyright (c) 2017 Andreas F?rber
+  * Copyright (c) 2017 Andreas Färber
   *
 - * SPDX-License-Identifier: GPL-2.0+
   */
@@ -3168,7 +3168,7 @@ index 569fe85e52da..65a2aabccaff 100644
  /*
   * Copyright (C) Nokia Corporation
   *
-  * Written by Timo Kokkonen <timo.t.kokkonen@nokia.com>
+  * Written by Timo Kokkonen <timo.t.kokkonen at nokia.com>
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
@@ -3678,7 +3678,7 @@ index d3594aa3a374..93d70f03c567 100644
   * Copyright (C) 2015 Zodiac Inflight Innovations
   *
 @@ -6,16 +7,6 @@
-  * Based on twl4030_wdt.c by Timo Kokkonen <timo.t.kokkonen@nokia.com>:
+  * Based on twl4030_wdt.c by Timo Kokkonen <timo.t.kokkonen at nokia.com>:
   *
   * Copyright (C) Nokia Corporation
 - *
diff --git a/a/content_digest b/N1/content_digest
index 5f67dcb..f149057 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,66 @@
- "From\0marcus.folkesson@gmail.com (Marcus Folkesson)\0"
+ "From\0Marcus Folkesson <marcus.folkesson@gmail.com>\0"
  "Subject\0[PATCH v2] watchdog: add SPDX identifiers for watchdog subsystem\0"
  "Date\0Tue, 20 Feb 2018 11:45:31 +0100\0"
- "To\0linus-amlogic@lists.infradead.org\0"
+ "To\0Wim Van Sebroeck <wim@linux-watchdog.org>"
+  Guenter Roeck <linux@roeck-us.net>
+  Joel Stanley <joel@jms.id.au>
+  Nicolas Ferre <nicolas.ferre@microchip.com>
+  Alexandre Belloni <alexandre.belloni@free-electrons.com>
+  Florian Fainelli <f.fainelli@gmail.com>
+  Ray Jui <rjui@broadcom.com>
+  Scott Branden <sbranden@broadcom.com>
+  bcm-kernel-feedback-list@broadcom.com
+  Eric Anholt <eric@anholt.net>
+  Stefan Wahren <stefan.wahren@i2se.com>
+  Linus Walleij <linus.walleij@linaro.org>
+  Support Opensource <support.opensource@diasemi.com>
+  Baruch Siach <baruch@tkos.co.il>
+  William Breathitt Gray <vilhelm.gray@gmail.com>
+  Jimmy Vance <jimmy.vance@hpe.com>
+  Keguang Zhang <keguang.zhang@gmail.com>
+  Joachim Eastwood <manabian@gmail.com>
+  Tomas Winkler <tomas.winkler@intel.com>
+  Johannes Thumshirn <morbidrsa@gmail.com>
+  Andreas Werner <andreas.werner@men.de>
+  Carlo Caione <carlo@caione.org>
+  Kevin Hilman <khilman@baylibre.com>
+  Matthias Brugger <matthias.bgg@gmail.com>
+  Wan ZongShun <mcuos.com@gmail.com>
+  Michal Simek <michal.simek@xilinx.com>
+  Vladimir Zapolskiy <vz@mleia.com>
+  Sylvain Lemieux <slemieux.tyco@gmail.com>
+  Kukjin Kim <kgene@kernel.org>
+  Krzysztof Kozlowski <krzk@kernel.org>
+  Zwane Mwaikambo <zwanem@gmail.com>
+  Jim Cromie <jim.cromie@gmail.com>
+  Barry Song <baohua@kernel.org>
+  Patrice Chotard <patrice.chotard@st.com>
+  Maxime Ripard <maxime.ripard@bootlin.com>
+  Chen-Yu Tsai <wens@csie.org>
+  Marc Gonzalez <marc.w.gonzalez@free.fr>
+  Mans Rullgard <mans@mansr.com>
+  Thierry Reding <thierry.reding@gmail.com>
+  Jonathan Hunter <jonathanh@nvidia.com>
+  Masahiro Yamada <yamada.masahiro@socionext.com>
+  Benjamin Herrenschmidt <benh@kernel.crashing.org>
+  Paul Mackerras <paulus@samba.org>
+  Michael Ellerman <mpe@ellerman.id.au>
+  Jun Nie <jun.nie@linaro.org>
+  Baoyou Xie <baoyou.xie@linaro.org>
+ " Shawn Guo <shawnguo@kernel.org>\0"
+ "Cc\0Marcus Folkesson <marcus.folkesson@gmail.com>"
+  linux-watchdog@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+  linux-rpi-kernel@lists.infradead.org
+  adi-buildroot-devel@lists.sourceforge.net
+  linux-mips@linux-mips.org
+  linux-amlogic@lists.infradead.org
+  linux-mediatek@lists.infradead.org
+  linux-samsung-soc@vger.kernel.org
+  linux-tegra@vger.kernel.org
+  linuxppc-dev@lists.ozlabs.org
+ " patches@opensource.cirrus.com\0"
  "\00:1\0"
  "b\0"
  "- Add SPDX identifier\n"
@@ -342,7 +401,7 @@
  " /*\n"
  "  * Watchdog driver for Atmel AT91SAM9x processors.\n"
  "  *\n"
- "  * Copyright (C) 2008 Renaud CERRATO r.cerrato at til-technologies.fr\n"
+ "  * Copyright (C) 2008 Renaud CERRATO r.cerrato@til-technologies.fr\n"
  "  *\n"
  "- * This program is free software; you can redistribute it and/or\n"
  "- * modify it under the terms of the GNU General Public License\n"
@@ -999,7 +1058,7 @@
  "  *\ti6300esb:\tWatchdog timer driver for Intel 6300ESB chipset\n"
  "  *\n"
  "  *\t(c) Copyright 2004 Google Inc.\n"
- "  *\t(c) Copyright 2005 David H?rdeman <david@2gen.com>\n"
+ "  *\t(c) Copyright 2005 David H\303\244rdeman <david@2gen.com>\n"
  "  *\n"
  "- *\tThis program is free software; you can redistribute it and/or\n"
  "- *\tmodify it under the terms of the GNU General Public License\n"
@@ -2193,7 +2252,7 @@
  "+// SPDX-License-Identifier: GPL-2.0+\n"
  " /*\n"
  "  * PC Watchdog Driver\n"
- "  * by Ken Hollis (khollis at bitgate.com)\n"
+ "  * by Ken Hollis (khollis@bitgate.com)\n"
  "diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c\n"
  "index 1f78f0908621..134a5c53a050 100644\n"
  "--- a/drivers/watchdog/pcwd_pci.c\n"
@@ -2446,7 +2505,7 @@
  "+// SPDX-License-Identifier: GPL-2.0+\n"
  " /* riowd.c - driver for hw watchdog inside Super I/O of RIO\n"
  "  *\n"
- "  * Copyright (C) 2001, 2008 David S. Miller (davem at davemloft.net)\n"
+ "  * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net)\n"
  "diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c\n"
  "index e60f55702ab7..9111909fde24 100644\n"
  "--- a/drivers/watchdog/rn5t618_wdt.c\n"
@@ -2496,7 +2555,7 @@
  " /*\n"
  "  * Realtek RTD129x watchdog\n"
  "  *\n"
- "  * Copyright (c) 2017 Andreas F?rber\n"
+ "  * Copyright (c) 2017 Andreas F\303\244rber\n"
  "  *\n"
  "- * SPDX-License-Identifier: GPL-2.0+\n"
  "  */\n"
@@ -3174,7 +3233,7 @@
  " /*\n"
  "  * Copyright (C) Nokia Corporation\n"
  "  *\n"
- "  * Written by Timo Kokkonen <timo.t.kokkonen@nokia.com>\n"
+ "  * Written by Timo Kokkonen <timo.t.kokkonen at nokia.com>\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 as published by\n"
@@ -3684,7 +3743,7 @@
  "  * Copyright (C) 2015 Zodiac Inflight Innovations\n"
  "  *\n"
  "@@ -6,16 +7,6 @@\n"
- "  * Based on twl4030_wdt.c by Timo Kokkonen <timo.t.kokkonen@nokia.com>:\n"
+ "  * Based on twl4030_wdt.c by Timo Kokkonen <timo.t.kokkonen at nokia.com>:\n"
  "  *\n"
  "  * Copyright (C) Nokia Corporation\n"
  "- *\n"
@@ -3720,4 +3779,4 @@
  "-- \n"
  2.15.1
 
-163da611a20e68bbacad44fe72f3247cd016802ee658d6d4e28aadbc1a6b76ff
+7d9a1e891a100383a1a81848d1db2ce81581fd2fad9fcc3c83b22dd209a9c22e
