diff for duplicates of <20180504070339.GS3443@dragon>

diff --git a/a/1.txt b/N1/1.txt
index f45f205..b4a4fc2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-On Thu, May 03, 2018 at 12:00:06PM +0200, T?rk, Jan wrote:
+On Thu, May 03, 2018 at 12:00:06PM +0200, Türk, Jan wrote:
 > > > +/ {
 > > > +   aliases {
 > > > +           mmc0 = &usdhc3;
@@ -9,7 +9,7 @@ On Thu, May 03, 2018 at 12:00:06PM +0200, T?rk, Jan wrote:
 > >
 > > Why do you need this boardID alias?
 > I wanted to have a generic entry point to address the board-id on all CPU-modules with their different SoC's resulting in different devicetree paths.
-> Also as it now has the generic "gpio at 3a" name, there would be no other way in differencing the board Identifying GPIO-expander from an additionally
+> Also as it now has the generic "gpio@3a" name, there would be no other way in differencing the board Identifying GPIO-expander from an additionally
 > attached one (except platform code etc.)
 > With the alias every code could look up the information required over the alias path with the same piece of code.
 
@@ -53,7 +53,7 @@ it difficult to find out which client devices consume which pins.
 > > > +   pinctrl-0 = <&pinctrl_i2c1>;
 > > > +   status = "okay";
 > > > +
-> > > +   rtc: rtc at 68 {
+> > > +   rtc: rtc@68 {
 > >
 > > Is the label actually used?  If yes, I would suggest a more specific name like
 > > ds1307.
@@ -62,7 +62,7 @@ it difficult to find out which client devices consume which pins.
 I'm talking about label not node name.  That said I was suggesting
 something like:
 
-	ds1307: rtc at 68
+	ds1307: rtc@68
 
 > 
 > >
@@ -71,3 +71,7 @@ something like:
 > > > +   };
 
 Shawn
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index e8208af..e2ba3ac 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,13 +3,25 @@
  "ref\020180427132445.3458-7-jan.tuerk@emtrion.com\0"
  "ref\020180428031231.GB3693@dragon\0"
  "ref\095F51F4B902CAC40AF459205F6322F01B83109E5C3@BMK019S01.emtrion.local\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v4 6/7] ARM: dts: Add support for emtrion emCON-MX6 series\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH v4 6/7] ARM: dts: Add support for emtrion emCON-MX6 series\0"
  "Date\0Fri, 4 May 2018 15:03:40 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0T\303\274rk"
+ " Jan <Jan.Tuerk@emtrion.de>\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  devicetree@vger.kernel.org <devicetree@vger.kernel.org>
+  David Airlie <airlied@linux.ie>
+  Russell King <linux@armlinux.org.uk>
+  dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+  Rob Herring <robh+dt@kernel.org>
+  Thierry Reding <thierry.reding@gmail.com>
+  Pengutronix Kernel Team <kernel@pengutronix.de>
+  Fabio Estevam <fabio.estevam@nxp.com>
+ " LinuxArmKernelMailingListe <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
- "On Thu, May 03, 2018 at 12:00:06PM +0200, T?rk, Jan wrote:\n"
+ "On Thu, May 03, 2018 at 12:00:06PM +0200, T\303\274rk, Jan wrote:\n"
  "> > > +/ {\n"
  "> > > +   aliases {\n"
  "> > > +           mmc0 = &usdhc3;\n"
@@ -20,7 +32,7 @@
  "> >\n"
  "> > Why do you need this boardID alias?\n"
  "> I wanted to have a generic entry point to address the board-id on all CPU-modules with their different SoC's resulting in different devicetree paths.\n"
- "> Also as it now has the generic \"gpio at 3a\" name, there would be no other way in differencing the board Identifying GPIO-expander from an additionally\n"
+ "> Also as it now has the generic \"gpio@3a\" name, there would be no other way in differencing the board Identifying GPIO-expander from an additionally\n"
  "> attached one (except platform code etc.)\n"
  "> With the alias every code could look up the information required over the alias path with the same piece of code.\n"
  "\n"
@@ -64,7 +76,7 @@
  "> > > +   pinctrl-0 = <&pinctrl_i2c1>;\n"
  "> > > +   status = \"okay\";\n"
  "> > > +\n"
- "> > > +   rtc: rtc at 68 {\n"
+ "> > > +   rtc: rtc@68 {\n"
  "> >\n"
  "> > Is the label actually used?  If yes, I would suggest a more specific name like\n"
  "> > ds1307.\n"
@@ -73,7 +85,7 @@
  "I'm talking about label not node name.  That said I was suggesting\n"
  "something like:\n"
  "\n"
- "\tds1307: rtc at 68\n"
+ "\tds1307: rtc@68\n"
  "\n"
  "> \n"
  "> >\n"
@@ -81,6 +93,10 @@
  "> > > +           reg = <0x68>;\n"
  "> > > +   };\n"
  "\n"
- Shawn
+ "Shawn\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-4a33009e584232fb37fe3f41cc436e8b2a567bc3ef1b06383a92b39e8b4f86d7
+e152281d1285aa52be43f681e0181afe45821b51891ad20e7d4b126af86fe570
