diff for duplicates of <2119603.JzqsNBunkW@phil>

diff --git a/a/1.txt b/N1/1.txt
index 20e118b..4119709 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,7 +3,7 @@ Hi Sandy,
 Am Donnerstag, 30. August 2018, 13:59:35 CEST schrieb Sandy Huang:
 > Hi heiko,
 > 
-> 在 2018/8/30 19:11, Heiko Stuebner 写道:
+> ? 2018/8/30 19:11, Heiko Stuebner ??:
 > > Add the core display subsystem and vop nodes to rk3188.
 > > Vop0 has a fully dedicated set of pins and only vop1 needs to
 > > do pinctrl to have display output, so also add the necessary
@@ -27,14 +27,14 @@ Am Donnerstag, 30. August 2018, 13:59:35 CEST schrieb Sandy Huang:
 > > +		ports = <&vop0_out>, <&vop1_out>;
 > > +	};
 > > +
-> >   	sram: sram@10080000 {
+> >   	sram: sram at 10080000 {
 > >   		compatible = "mmio-sram";
 > >   		reg = <0x10080000 0x8000>;
 > > @@ -69,6 +74,40 @@
 > >   		};
 > >   	};
 > >   
-> > +	vop0: vop@1010c000 {
+> > +	vop0: vop at 1010c000 {
 > > +		compatible = "rockchip,rk3188-vop";
 > > +		reg = <0x1010c000 0x1000>;
 > > +		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
@@ -50,7 +50,7 @@ Am Donnerstag, 30. August 2018, 13:59:35 CEST schrieb Sandy Huang:
 > > +		};
 > > +	};
 > > +
-> > +	vop1: vop@1010e000 {
+> > +	vop1: vop at 1010e000 {
 > > +		compatible = "rockchip,rk3188-vop";
 > > +		reg = <0x1010e000 0x1000>;
 > > +		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -73,10 +73,3 @@ For other socs like the px30 and rk3066 which mix rgb and hdmi or so
 I definitly agree that pinctrl should be set in board files :-) .
 
 Heiko
-
-
-
-_______________________________________________
-Linux-rockchip mailing list
-Linux-rockchip@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-rockchip
diff --git a/a/content_digest b/N1/content_digest
index 6cda087..3fc9c26 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,12 +1,9 @@
  "ref\020180830111134.2098-1-heiko@sntech.de\0"
  "ref\042ff42a7-ebd8-e717-af3d-a18de5e4d05c@rock-chips.com\0"
- "ref\042ff42a7-ebd8-e717-af3d-a18de5e4d05c-TNX95d0MmH7DzftRWevZcw@public.gmane.org\0"
- "From\0Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0"
- "Subject\0Re: [PATCH] ARM: dts: rockchip: add rk3188 lcd controller nodes\0"
+ "From\0heiko@sntech.de (Heiko Stuebner)\0"
+ "Subject\0[PATCH] ARM: dts: rockchip: add rk3188 lcd controller nodes\0"
  "Date\0Thu, 30 Aug 2018 14:22:32 +0200\0"
- "To\0Sandy Huang <hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org>\0"
- "Cc\0linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org"
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Sandy,\n"
@@ -14,7 +11,7 @@
  "Am Donnerstag, 30. August 2018, 13:59:35 CEST schrieb Sandy Huang:\n"
  "> Hi heiko,\n"
  "> \n"
- "> \345\234\250 2018/8/30 19:11, Heiko Stuebner \345\206\231\351\201\223:\n"
+ "> ? 2018/8/30 19:11, Heiko Stuebner ??:\n"
  "> > Add the core display subsystem and vop nodes to rk3188.\n"
  "> > Vop0 has a fully dedicated set of pins and only vop1 needs to\n"
  "> > do pinctrl to have display output, so also add the necessary\n"
@@ -38,14 +35,14 @@
  "> > +\t\tports = <&vop0_out>, <&vop1_out>;\n"
  "> > +\t};\n"
  "> > +\n"
- "> >   \tsram: sram@10080000 {\n"
+ "> >   \tsram: sram at 10080000 {\n"
  "> >   \t\tcompatible = \"mmio-sram\";\n"
  "> >   \t\treg = <0x10080000 0x8000>;\n"
  "> > @@ -69,6 +74,40 @@\n"
  "> >   \t\t};\n"
  "> >   \t};\n"
  "> >   \n"
- "> > +\tvop0: vop@1010c000 {\n"
+ "> > +\tvop0: vop at 1010c000 {\n"
  "> > +\t\tcompatible = \"rockchip,rk3188-vop\";\n"
  "> > +\t\treg = <0x1010c000 0x1000>;\n"
  "> > +\t\tinterrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -61,7 +58,7 @@
  "> > +\t\t};\n"
  "> > +\t};\n"
  "> > +\n"
- "> > +\tvop1: vop@1010e000 {\n"
+ "> > +\tvop1: vop at 1010e000 {\n"
  "> > +\t\tcompatible = \"rockchip,rk3188-vop\";\n"
  "> > +\t\treg = <0x1010e000 0x1000>;\n"
  "> > +\t\tinterrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -83,13 +80,6 @@
  "For other socs like the px30 and rk3066 which mix rgb and hdmi or so\n"
  "I definitly agree that pinctrl should be set in board files :-) .\n"
  "\n"
- "Heiko\n"
- "\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "Linux-rockchip mailing list\n"
- "Linux-rockchip@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-rockchip
+ Heiko
 
-a2cb5e9c7ce2963ee062c34bf00aca20d5808c1ca57ad6c3ea9453a4e853f83d
+6763381604fa37aecf71dbef08eb7bc0eb1423636bbc254d09d7444ad453234b
