diff for duplicates of <20150811175019.2416.93864@quantum>

diff --git a/a/1.txt b/N1/1.txt
index 2073a33..e20ce42 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -10,25 +10,21 @@ Quoting Chen-Yu Tsai (2015-08-10 21:49:54)
 > >>  arch/arm/boot/dts/sun8i-a23-a33.dtsi | 15 +++++++++++++++
 > >>  1 file changed, 15 insertions(+)
 > >>
-> >> diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/=
-sun8i-a23-a33.dtsi
+> >> diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
 > >> index 7abd0ae3143d..c318c770b6c1 100644
 > >> --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi
 > >> +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi
 > >> @@ -180,6 +180,15 @@
-> >>                         compatible =3D "allwinner,sun8i-a23-ahb1-gates=
--clk";
-> >>                         reg =3D <0x01c20060 0x8>;
-> >>                         clocks =3D <&ahb1>;
-> >> +                       clock-indices =3D <1>, <6>,
+> >>                         compatible = "allwinner,sun8i-a23-ahb1-gates-clk";
+> >>                         reg = <0x01c20060 0x8>;
+> >>                         clocks = <&ahb1>;
+> >> +                       clock-indices = <1>, <6>,
 > >
 > > Turns out the A33 (and I assume the same with the A23) has
 > > an ahb1 clock gate for the Security System at clock-index <5>.
-> =
-
+> 
 > Looks like the A23 does not have this one, nor the SS mod clock.
-> =
-
+> 
 > > This is found in the updated A33 user manual.
 > >
 > >> +                                       <8>, <9>, <10>,
@@ -40,20 +36,16 @@ sun8i-a23-a33.dtsi
 > >> +                                       <52>, <54>,
 > >
 > > <53> is ahb1 clock gate for msgbox, again found in A33 manual.
-> =
-
+> 
 > A23 has this one. Found in Allwinner kernel sources.
-> =
-
+> 
 > >> +                                       <57>;
 > >
 > > <58> is ahb1 clock gate for SAT, which seems to be part of the
 > > display pipeline.
-> =
-
+> 
 > This one is A33 only.
-> =
-
+> 
 > I guess we should do a separate compatible for A33 AHB1 clock gates.
 
 ChenYu,
@@ -67,38 +59,30 @@ If so then I will apply them to clk-next.
 Regards,
 Mike
 
-> =
-
+> 
 > ChenYu
-> =
-
-> >>                         clock-output-names =3D "ahb1_mipidsi", "ahb1_d=
-ma",
-> >>                                         "ahb1_mmc0", "ahb1_mmc1", "ahb=
-1_mmc2",
+> 
+> >>                         clock-output-names = "ahb1_mipidsi", "ahb1_dma",
+> >>                                         "ahb1_mmc0", "ahb1_mmc1", "ahb1_mmc2",
 > >>                                         "ahb1_nand", "ahb1_sdram",
 > >> @@ -196,6 +205,8 @@
-> >>                         compatible =3D "allwinner,sun8i-a23-apb1-gates=
--clk";
-> >>                         reg =3D <0x01c20068 0x4>;
-> >>                         clocks =3D <&apb1>;
-> >> +                       clock-indices =3D <0>, <5>,
+> >>                         compatible = "allwinner,sun8i-a23-apb1-gates-clk";
+> >>                         reg = <0x01c20068 0x4>;
+> >>                         clocks = <&apb1>;
+> >> +                       clock-indices = <0>, <5>,
 > >> +                                       <12>, <13>;
-> >>                         clock-output-names =3D "apb1_codec", "apb1_pio=
-",
+> >>                         clock-output-names = "apb1_codec", "apb1_pio",
 > >>                                         "apb1_daudio0", "apb1_daudio1";
 > >>                 };
 > >> @@ -213,6 +224,10 @@
-> >>                         compatible =3D "allwinner,sun8i-a23-apb2-gates=
--clk";
-> >>                         reg =3D <0x01c2006c 0x4>;
-> >>                         clocks =3D <&apb2>;
-> >> +                       clock-indices =3D <0>, <1>,
+> >>                         compatible = "allwinner,sun8i-a23-apb2-gates-clk";
+> >>                         reg = <0x01c2006c 0x4>;
+> >>                         clocks = <&apb2>;
+> >> +                       clock-indices = <0>, <1>,
 > >> +                                       <2>, <16>,
 > >> +                                       <17>, <18>,
 > >> +                                       <19>, <20>;
-> >>                         clock-output-names =3D "apb2_i2c0", "apb2_i2c1=
-",
+> >>                         clock-output-names = "apb2_i2c0", "apb2_i2c1",
 > >>                                         "apb2_i2c2", "apb2_uart0",
 > >>                                         "apb2_uart1", "apb2_uart2",
 > >> --
@@ -111,9 +95,8 @@ ma",
 > > The rest look good.
 > >
 > > ChenYu
-> =
-
+> 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel@lists.infradead.org
+> linux-arm-kernel at lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index aa823b0..dc45edc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,15 +2,10 @@
  "ref\01438364782-3968-6-git-send-email-maxime.ripard@free-electrons.com\0"
  "ref\0CAGb2v64nvA1K=Ya7_99-2G1LtFjcuj+qQbO1GJaqsL+yPF+Xdw@mail.gmail.com\0"
  "ref\0CAGb2v64-=1Byzo-h=7Pq=HK9Xx01KaTKT89Nx6jVWUc_kqthyg@mail.gmail.com\0"
- "From\0Michael Turquette <mturquette@baylibre.com>\0"
- "Subject\0Re: [PATCH v2 5/7] ARM: sun8i: Add clock indices\0"
+ "From\0mturquette@baylibre.com (Michael Turquette)\0"
+ "Subject\0[PATCH v2 5/7] ARM: sun8i: Add clock indices\0"
  "Date\0Tue, 11 Aug 2015 10:50:19 -0700\0"
- "To\0Chen-Yu Tsai <wens@csie.org>"
- " Chen-Yu Tsai <wens@csie.org>\0"
- "Cc\0Maxime Ripard <maxime.ripard@free-electrons.com>"
-  Stephen Boyd <sboyd@codeaurora.org>
-  linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
- " linux-clk <linux-clk@vger.kernel.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Quoting Chen-Yu Tsai (2015-08-10 21:49:54)\n"
@@ -25,25 +20,21 @@
  "> >>  arch/arm/boot/dts/sun8i-a23-a33.dtsi | 15 +++++++++++++++\n"
  "> >>  1 file changed, 15 insertions(+)\n"
  "> >>\n"
- "> >> diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/=\n"
- "sun8i-a23-a33.dtsi\n"
+ "> >> diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi\n"
  "> >> index 7abd0ae3143d..c318c770b6c1 100644\n"
  "> >> --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi\n"
  "> >> +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi\n"
  "> >> @@ -180,6 +180,15 @@\n"
- "> >>                         compatible =3D \"allwinner,sun8i-a23-ahb1-gates=\n"
- "-clk\";\n"
- "> >>                         reg =3D <0x01c20060 0x8>;\n"
- "> >>                         clocks =3D <&ahb1>;\n"
- "> >> +                       clock-indices =3D <1>, <6>,\n"
+ "> >>                         compatible = \"allwinner,sun8i-a23-ahb1-gates-clk\";\n"
+ "> >>                         reg = <0x01c20060 0x8>;\n"
+ "> >>                         clocks = <&ahb1>;\n"
+ "> >> +                       clock-indices = <1>, <6>,\n"
  "> >\n"
  "> > Turns out the A33 (and I assume the same with the A23) has\n"
  "> > an ahb1 clock gate for the Security System at clock-index <5>.\n"
- "> =\n"
- "\n"
+ "> \n"
  "> Looks like the A23 does not have this one, nor the SS mod clock.\n"
- "> =\n"
- "\n"
+ "> \n"
  "> > This is found in the updated A33 user manual.\n"
  "> >\n"
  "> >> +                                       <8>, <9>, <10>,\n"
@@ -55,20 +46,16 @@
  "> >> +                                       <52>, <54>,\n"
  "> >\n"
  "> > <53> is ahb1 clock gate for msgbox, again found in A33 manual.\n"
- "> =\n"
- "\n"
+ "> \n"
  "> A23 has this one. Found in Allwinner kernel sources.\n"
- "> =\n"
- "\n"
+ "> \n"
  "> >> +                                       <57>;\n"
  "> >\n"
  "> > <58> is ahb1 clock gate for SAT, which seems to be part of the\n"
  "> > display pipeline.\n"
- "> =\n"
- "\n"
+ "> \n"
  "> This one is A33 only.\n"
- "> =\n"
- "\n"
+ "> \n"
  "> I guess we should do a separate compatible for A33 AHB1 clock gates.\n"
  "\n"
  "ChenYu,\n"
@@ -82,38 +69,30 @@
  "Regards,\n"
  "Mike\n"
  "\n"
- "> =\n"
- "\n"
+ "> \n"
  "> ChenYu\n"
- "> =\n"
- "\n"
- "> >>                         clock-output-names =3D \"ahb1_mipidsi\", \"ahb1_d=\n"
- "ma\",\n"
- "> >>                                         \"ahb1_mmc0\", \"ahb1_mmc1\", \"ahb=\n"
- "1_mmc2\",\n"
+ "> \n"
+ "> >>                         clock-output-names = \"ahb1_mipidsi\", \"ahb1_dma\",\n"
+ "> >>                                         \"ahb1_mmc0\", \"ahb1_mmc1\", \"ahb1_mmc2\",\n"
  "> >>                                         \"ahb1_nand\", \"ahb1_sdram\",\n"
  "> >> @@ -196,6 +205,8 @@\n"
- "> >>                         compatible =3D \"allwinner,sun8i-a23-apb1-gates=\n"
- "-clk\";\n"
- "> >>                         reg =3D <0x01c20068 0x4>;\n"
- "> >>                         clocks =3D <&apb1>;\n"
- "> >> +                       clock-indices =3D <0>, <5>,\n"
+ "> >>                         compatible = \"allwinner,sun8i-a23-apb1-gates-clk\";\n"
+ "> >>                         reg = <0x01c20068 0x4>;\n"
+ "> >>                         clocks = <&apb1>;\n"
+ "> >> +                       clock-indices = <0>, <5>,\n"
  "> >> +                                       <12>, <13>;\n"
- "> >>                         clock-output-names =3D \"apb1_codec\", \"apb1_pio=\n"
- "\",\n"
+ "> >>                         clock-output-names = \"apb1_codec\", \"apb1_pio\",\n"
  "> >>                                         \"apb1_daudio0\", \"apb1_daudio1\";\n"
  "> >>                 };\n"
  "> >> @@ -213,6 +224,10 @@\n"
- "> >>                         compatible =3D \"allwinner,sun8i-a23-apb2-gates=\n"
- "-clk\";\n"
- "> >>                         reg =3D <0x01c2006c 0x4>;\n"
- "> >>                         clocks =3D <&apb2>;\n"
- "> >> +                       clock-indices =3D <0>, <1>,\n"
+ "> >>                         compatible = \"allwinner,sun8i-a23-apb2-gates-clk\";\n"
+ "> >>                         reg = <0x01c2006c 0x4>;\n"
+ "> >>                         clocks = <&apb2>;\n"
+ "> >> +                       clock-indices = <0>, <1>,\n"
  "> >> +                                       <2>, <16>,\n"
  "> >> +                                       <17>, <18>,\n"
  "> >> +                                       <19>, <20>;\n"
- "> >>                         clock-output-names =3D \"apb2_i2c0\", \"apb2_i2c1=\n"
- "\",\n"
+ "> >>                         clock-output-names = \"apb2_i2c0\", \"apb2_i2c1\",\n"
  "> >>                                         \"apb2_i2c2\", \"apb2_uart0\",\n"
  "> >>                                         \"apb2_uart1\", \"apb2_uart2\",\n"
  "> >> --\n"
@@ -126,11 +105,10 @@
  "> > The rest look good.\n"
  "> >\n"
  "> > ChenYu\n"
- "> =\n"
- "\n"
+ "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel@lists.infradead.org\n"
+ "> linux-arm-kernel at lists.infradead.org\n"
  > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-28ab2de1bf37d650821c031419c6643c8ea453c9d31dc431ccb772ef1fc23f7f
+b8edd81a7ea377aca35c4bf4df8271e923f5685997cd5f69f81e90d8ad348a8d
