diff for duplicates of <92631471566914@web15j.yandex.ru>

diff --git a/a/1.txt b/N1/1.txt
index 4080f9a..cbe89fb 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,10 +16,10 @@ It makes it more tidy.
 >
 > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 > ---
-> ?arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 147 +--------------------
-> ?...8-q1.dts => sun6i-reference-design-tablet.dtsi} | 26 +---
-> ?2 files changed, 2 insertions(+), 171 deletions(-)
-> ?copy arch/arm/boot/dts/{sun6i-a31s-colorfly-e708-q1.dts => sun6i-reference-design-tablet.dtsi} (90%)
+>  arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 147 +--------------------
+>  ...8-q1.dts => sun6i-reference-design-tablet.dtsi} | 26 +---
+>  2 files changed, 2 insertions(+), 171 deletions(-)
+>  copy arch/arm/boot/dts/{sun6i-a31s-colorfly-e708-q1.dts => sun6i-reference-design-tablet.dtsi} (90%)
 >
 > diff --git a/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts b/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts
 > index 34d8710..882a4d8 100644
@@ -27,8 +27,8 @@ It makes it more tidy.
 > +++ b/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts
 > @@ -42,32 +42,11 @@
 >
-> ?/dts-v1/;
-> ?#include "sun6i-a31s.dtsi"
+>  /dts-v1/;
+>  #include "sun6i-a31s.dtsi"
 > -#include "sunxi-common-regulators.dtsi"
 > -
 > -#include <dt-bindings/gpio/gpio.h>
@@ -36,9 +36,9 @@ It makes it more tidy.
 > -#include <dt-bindings/pinctrl/sun4i-a10.h>
 > +#include "sun6i-reference-design-tablet.dtsi"
 >
-> ?/ {
-> ?????????model = "Colorfly E708 Q1 tablet";
-> ?????????compatible = "colorfly,e708-q1", "allwinner,sun6i-a31s";
+>  / {
+>          model = "Colorfly E708 Q1 tablet";
+>          compatible = "colorfly,e708-q1", "allwinner,sun6i-a31s";
 > -
 > - aliases {
 > - serial0 = &uart0;
@@ -56,12 +56,12 @@ It makes it more tidy.
 > -&ehci0 {
 > - /* rtl8188etv wifi is connected here */
 > - status = "okay";
-> ?};
+>  };
 >
-> ?&lradc {
+>  &lradc {
 > @@ -82,136 +61,12 @@
-> ?????????};
-> ?};
+>          };
+>  };
 >
 > -&mmc0 {
 > - pinctrl-names = "default";
@@ -74,14 +74,14 @@ It makes it more tidy.
 > -};
 > -
 > -&pio {
-> - mmc0_cd_pin_e708_q1: mmc0_cd_pin at 0 {
+> - mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 {
 > - allwinner,pins = "PA8";
 > - allwinner,function = "gpio_in";
 > - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
 > - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
 > - };
 > -
-> - usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+> - usb0_id_detect_pin: usb0_id_detect_pin@0 {
 > - allwinner,pins = "PA15";
 > - allwinner,function = "gpio_in";
 > - allwinner,drive = <SUN4I_PINCTRL_10_MA>;
@@ -92,7 +92,7 @@ It makes it more tidy.
 > -&p2wi {
 > - status = "okay";
 > -
-> - axp22x: pmic at 68 {
+> - axp22x: pmic@68 {
 > - compatible = "x-powers,axp221";
 > - reg = <0x68>;
 > - interrupt-parent = <&nmi_intc>;
@@ -162,21 +162,21 @@ It makes it more tidy.
 > - regulator-name = "vcc-wifi";
 > -};
 > -
-> ?&reg_dldo2 {
-> ?????????regulator-min-microvolt = <1800000>;
-> ?????????regulator-max-microvolt = <1800000>;
-> ?????????regulator-name = "vcc-pg";
-> ?};
+>  &reg_dldo2 {
+>          regulator-min-microvolt = <1800000>;
+>          regulator-max-microvolt = <1800000>;
+>          regulator-name = "vcc-pg";
+>  };
 >
 > -&reg_drivevbus {
 > - regulator-name = "usb0-vbus";
 > - status = "okay";
 > -};
 > -
-> ?&simplefb_lcd {
+>  &simplefb_lcd {
 > - vcc-lcd-supply = <&reg_dc1sw>;
-> ?????????vcc-pg-supply = <&reg_dldo2>;
-> ?};
+>          vcc-pg-supply = <&reg_dldo2>;
+>  };
 > -
 > -&usb_otg {
 > - dr_mode = "otg";
@@ -204,28 +204,28 @@ It makes it more tidy.
 > --- a/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts
 > +++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
 > @@ -40,8 +40,6 @@
-> ??* OTHER DEALINGS IN THE SOFTWARE.
-> ??*/
+>   * OTHER DEALINGS IN THE SOFTWARE.
+>   */
 >
 > -/dts-v1/;
 > -#include "sun6i-a31s.dtsi"
-> ?#include "sunxi-common-regulators.dtsi"
+>  #include "sunxi-common-regulators.dtsi"
 >
-> ?#include <dt-bindings/gpio/gpio.h>
+>  #include <dt-bindings/gpio/gpio.h>
 > @@ -49,9 +47,6 @@
-> ?#include <dt-bindings/pinctrl/sun4i-a10.h>
+>  #include <dt-bindings/pinctrl/sun4i-a10.h>
 >
-> ?/ {
+>  / {
 > - model = "Colorfly E708 Q1 tablet";
 > - compatible = "colorfly,e708-q1", "allwinner,sun6i-a31s";
 > -
-> ?????????aliases {
-> ?????????????????serial0 = &uart0;
-> ?????????};
+>          aliases {
+>                  serial0 = &uart0;
+>          };
 > @@ -66,20 +61,8 @@
-> ?};
+>  };
 >
-> ?&ehci0 {
+>  &ehci0 {
 > - /* rtl8188etv wifi is connected here */
 > - status = "okay";
 > -};
@@ -233,20 +233,20 @@ It makes it more tidy.
 > -&lradc {
 > - vref-supply = <&reg_aldo3>;
 > + /* Wifi is connected here */
-> ?????????status = "okay";
+>          status = "okay";
 > -
-> - button at 1000 {
+> - button@1000 {
 > - label = "Home";
 > - linux,code = <KEY_HOMEPAGE>;
 > - channel = <0>;
 > - voltage = <1000000>;
 > - };
-> ?};
+>  };
 >
-> ?&mmc0 {
+>  &mmc0 {
 > @@ -181,12 +164,6 @@
-> ?????????regulator-name = "vcc-wifi";
-> ?};
+>          regulator-name = "vcc-wifi";
+>  };
 >
 > -&reg_dldo2 {
 > - regulator-min-microvolt = <1800000>;
@@ -254,21 +254,26 @@ It makes it more tidy.
 > - regulator-name = "vcc-pg";
 > -};
 > -
-> ?&reg_drivevbus {
-> ?????????regulator-name = "usb0-vbus";
-> ?????????status = "okay";
+>  &reg_drivevbus {
+>          regulator-name = "usb0-vbus";
+>          status = "okay";
 > @@ -194,7 +171,6 @@
 >
-> ?&simplefb_lcd {
-> ?????????vcc-lcd-supply = <&reg_dc1sw>;
+>  &simplefb_lcd {
+>          vcc-lcd-supply = <&reg_dc1sw>;
 > - vcc-pg-supply = <&reg_dldo2>;
-> ?};
+>  };
 >
-> ?&usb_otg {
+>  &usb_otg {
 > --
 > 2.7.4
 >
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index e9afdc1..1b052b9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,13 @@
  "ref\01471543337-6938-1-git-send-email-hdegoede@redhat.com\0"
  "ref\01471543337-6938-3-git-send-email-hdegoede@redhat.com\0"
- "From\0icenowy@aosc.xyz (Icenowy Zheng)\0"
- "Subject\0[PATCH v2 2/3] ARM: dts: sun6i: Add sun6i-reference-design-tablet.dtsi\0"
+ "From\0Icenowy Zheng <icenowy@aosc.xyz>\0"
+ "Subject\0Re: [PATCH v2 2/3] ARM: dts: sun6i: Add sun6i-reference-design-tablet.dtsi\0"
  "Date\0Fri, 19 Aug 2016 08:35:14 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Hans de Goede <hdegoede@redhat.com>"
+  Chen-Yu Tsai <wens@csie.org>
+ " Maxime Ripard <maxime.ripard@free-electrons.com>\0"
+ "Cc\0devicetree <devicetree@vger.kernel.org>"
+ " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "\n"
@@ -24,10 +28,10 @@
  ">\n"
  "> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n"
  "> ---\n"
- "> ?arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 147 +--------------------\n"
- "> ?...8-q1.dts => sun6i-reference-design-tablet.dtsi} | 26 +---\n"
- "> ?2 files changed, 2 insertions(+), 171 deletions(-)\n"
- "> ?copy arch/arm/boot/dts/{sun6i-a31s-colorfly-e708-q1.dts => sun6i-reference-design-tablet.dtsi} (90%)\n"
+ "> \302\240arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 147 +--------------------\n"
+ "> \302\240...8-q1.dts => sun6i-reference-design-tablet.dtsi} | 26 +---\n"
+ "> \302\2402 files changed, 2 insertions(+), 171 deletions(-)\n"
+ "> \302\240copy arch/arm/boot/dts/{sun6i-a31s-colorfly-e708-q1.dts => sun6i-reference-design-tablet.dtsi} (90%)\n"
  ">\n"
  "> diff --git a/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts b/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts\n"
  "> index 34d8710..882a4d8 100644\n"
@@ -35,8 +39,8 @@
  "> +++ b/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts\n"
  "> @@ -42,32 +42,11 @@\n"
  ">\n"
- "> ?/dts-v1/;\n"
- "> ?#include \"sun6i-a31s.dtsi\"\n"
+ "> \302\240/dts-v1/;\n"
+ "> \302\240#include \"sun6i-a31s.dtsi\"\n"
  "> -#include \"sunxi-common-regulators.dtsi\"\n"
  "> -\n"
  "> -#include <dt-bindings/gpio/gpio.h>\n"
@@ -44,9 +48,9 @@
  "> -#include <dt-bindings/pinctrl/sun4i-a10.h>\n"
  "> +#include \"sun6i-reference-design-tablet.dtsi\"\n"
  ">\n"
- "> ?/ {\n"
- "> ?????????model = \"Colorfly E708 Q1 tablet\";\n"
- "> ?????????compatible = \"colorfly,e708-q1\", \"allwinner,sun6i-a31s\";\n"
+ "> \302\240/ {\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240model = \"Colorfly E708 Q1 tablet\";\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240compatible = \"colorfly,e708-q1\", \"allwinner,sun6i-a31s\";\n"
  "> -\n"
  "> - aliases {\n"
  "> - serial0 = &uart0;\n"
@@ -64,12 +68,12 @@
  "> -&ehci0 {\n"
  "> - /* rtl8188etv wifi is connected here */\n"
  "> - status = \"okay\";\n"
- "> ?};\n"
+ "> \302\240};\n"
  ">\n"
- "> ?&lradc {\n"
+ "> \302\240&lradc {\n"
  "> @@ -82,136 +61,12 @@\n"
- "> ?????????};\n"
- "> ?};\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240};\n"
+ "> \302\240};\n"
  ">\n"
  "> -&mmc0 {\n"
  "> - pinctrl-names = \"default\";\n"
@@ -82,14 +86,14 @@
  "> -};\n"
  "> -\n"
  "> -&pio {\n"
- "> - mmc0_cd_pin_e708_q1: mmc0_cd_pin at 0 {\n"
+ "> - mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 {\n"
  "> - allwinner,pins = \"PA8\";\n"
  "> - allwinner,function = \"gpio_in\";\n"
  "> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;\n"
  "> - allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;\n"
  "> - };\n"
  "> -\n"
- "> - usb0_id_detect_pin: usb0_id_detect_pin at 0 {\n"
+ "> - usb0_id_detect_pin: usb0_id_detect_pin@0 {\n"
  "> - allwinner,pins = \"PA15\";\n"
  "> - allwinner,function = \"gpio_in\";\n"
  "> - allwinner,drive = <SUN4I_PINCTRL_10_MA>;\n"
@@ -100,7 +104,7 @@
  "> -&p2wi {\n"
  "> - status = \"okay\";\n"
  "> -\n"
- "> - axp22x: pmic at 68 {\n"
+ "> - axp22x: pmic@68 {\n"
  "> - compatible = \"x-powers,axp221\";\n"
  "> - reg = <0x68>;\n"
  "> - interrupt-parent = <&nmi_intc>;\n"
@@ -170,21 +174,21 @@
  "> - regulator-name = \"vcc-wifi\";\n"
  "> -};\n"
  "> -\n"
- "> ?&reg_dldo2 {\n"
- "> ?????????regulator-min-microvolt = <1800000>;\n"
- "> ?????????regulator-max-microvolt = <1800000>;\n"
- "> ?????????regulator-name = \"vcc-pg\";\n"
- "> ?};\n"
+ "> \302\240&reg_dldo2 {\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240regulator-min-microvolt = <1800000>;\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240regulator-max-microvolt = <1800000>;\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240regulator-name = \"vcc-pg\";\n"
+ "> \302\240};\n"
  ">\n"
  "> -&reg_drivevbus {\n"
  "> - regulator-name = \"usb0-vbus\";\n"
  "> - status = \"okay\";\n"
  "> -};\n"
  "> -\n"
- "> ?&simplefb_lcd {\n"
+ "> \302\240&simplefb_lcd {\n"
  "> - vcc-lcd-supply = <&reg_dc1sw>;\n"
- "> ?????????vcc-pg-supply = <&reg_dldo2>;\n"
- "> ?};\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240vcc-pg-supply = <&reg_dldo2>;\n"
+ "> \302\240};\n"
  "> -\n"
  "> -&usb_otg {\n"
  "> - dr_mode = \"otg\";\n"
@@ -212,28 +216,28 @@
  "> --- a/arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts\n"
  "> +++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi\n"
  "> @@ -40,8 +40,6 @@\n"
- "> ??* OTHER DEALINGS IN THE SOFTWARE.\n"
- "> ??*/\n"
+ "> \302\240\302\240* OTHER DEALINGS IN THE SOFTWARE.\n"
+ "> \302\240\302\240*/\n"
  ">\n"
  "> -/dts-v1/;\n"
  "> -#include \"sun6i-a31s.dtsi\"\n"
- "> ?#include \"sunxi-common-regulators.dtsi\"\n"
+ "> \302\240#include \"sunxi-common-regulators.dtsi\"\n"
  ">\n"
- "> ?#include <dt-bindings/gpio/gpio.h>\n"
+ "> \302\240#include <dt-bindings/gpio/gpio.h>\n"
  "> @@ -49,9 +47,6 @@\n"
- "> ?#include <dt-bindings/pinctrl/sun4i-a10.h>\n"
+ "> \302\240#include <dt-bindings/pinctrl/sun4i-a10.h>\n"
  ">\n"
- "> ?/ {\n"
+ "> \302\240/ {\n"
  "> - model = \"Colorfly E708 Q1 tablet\";\n"
  "> - compatible = \"colorfly,e708-q1\", \"allwinner,sun6i-a31s\";\n"
  "> -\n"
- "> ?????????aliases {\n"
- "> ?????????????????serial0 = &uart0;\n"
- "> ?????????};\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240aliases {\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240serial0 = &uart0;\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240};\n"
  "> @@ -66,20 +61,8 @@\n"
- "> ?};\n"
+ "> \302\240};\n"
  ">\n"
- "> ?&ehci0 {\n"
+ "> \302\240&ehci0 {\n"
  "> - /* rtl8188etv wifi is connected here */\n"
  "> - status = \"okay\";\n"
  "> -};\n"
@@ -241,20 +245,20 @@
  "> -&lradc {\n"
  "> - vref-supply = <&reg_aldo3>;\n"
  "> + /* Wifi is connected here */\n"
- "> ?????????status = \"okay\";\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240status = \"okay\";\n"
  "> -\n"
- "> - button at 1000 {\n"
+ "> - button@1000 {\n"
  "> - label = \"Home\";\n"
  "> - linux,code = <KEY_HOMEPAGE>;\n"
  "> - channel = <0>;\n"
  "> - voltage = <1000000>;\n"
  "> - };\n"
- "> ?};\n"
+ "> \302\240};\n"
  ">\n"
- "> ?&mmc0 {\n"
+ "> \302\240&mmc0 {\n"
  "> @@ -181,12 +164,6 @@\n"
- "> ?????????regulator-name = \"vcc-wifi\";\n"
- "> ?};\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240regulator-name = \"vcc-wifi\";\n"
+ "> \302\240};\n"
  ">\n"
  "> -&reg_dldo2 {\n"
  "> - regulator-min-microvolt = <1800000>;\n"
@@ -262,23 +266,28 @@
  "> - regulator-name = \"vcc-pg\";\n"
  "> -};\n"
  "> -\n"
- "> ?&reg_drivevbus {\n"
- "> ?????????regulator-name = \"usb0-vbus\";\n"
- "> ?????????status = \"okay\";\n"
+ "> \302\240&reg_drivevbus {\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240regulator-name = \"usb0-vbus\";\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240status = \"okay\";\n"
  "> @@ -194,7 +171,6 @@\n"
  ">\n"
- "> ?&simplefb_lcd {\n"
- "> ?????????vcc-lcd-supply = <&reg_dc1sw>;\n"
+ "> \302\240&simplefb_lcd {\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240vcc-lcd-supply = <&reg_dc1sw>;\n"
  "> - vcc-pg-supply = <&reg_dldo2>;\n"
- "> ?};\n"
+ "> \302\240};\n"
  ">\n"
- "> ?&usb_otg {\n"
+ "> \302\240&usb_otg {\n"
  "> --\n"
  "> 2.7.4\n"
  ">\n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
- > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ "> linux-arm-kernel@lists.infradead.org\n"
+ "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-fb7c8d80f8bab5a28aa1e23d3a627f6c3b338e2ceb34f306862b3ac99b115534
+a0183341ef4cc8dee1a68e2e7d5c3704ccf1d0ad4e5b8841e5b05531bb836873
