diff for duplicates of <48051469971092@web25g.yandex.ru>

diff --git a/a/1.txt b/N1/1.txt
index fc8687d..de8396f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,16 +3,16 @@
 31.07.2016, 20:39, "Amit Tomer" <amittomer25@gmail.com>:
 > Hello ,
 >
->> ?@@ -264,6 +266,12 @@ static int sun4i_usb_phy_init(struct phy *_phy)
->> ?????????????????val = readl(phy->pmu + REG_PMU_UNK_H3);
->> ?????????????????writel(val & ~2, phy->pmu + REG_PMU_UNK_H3);
->> ?????????} else {
->> ?+ /* A64 needs also this unknown bit */
->> ?+ if (data->cfg->type == sun50i_a64_phy) {
->> ?+ val = readl(phy->pmu + REG_PMU_UNK_H3);
->> ?+ writel(val & ~2, phy->pmu + REG_PMU_UNK_H3);
->> ?+ }
->> ?+
+>>  @@ -264,6 +266,12 @@ static int sun4i_usb_phy_init(struct phy *_phy)
+>>                  val = readl(phy->pmu + REG_PMU_UNK_H3);
+>>                  writel(val & ~2, phy->pmu + REG_PMU_UNK_H3);
+>>          } else {
+>>  + /* A64 needs also this unknown bit */
+>>  + if (data->cfg->type == sun50i_a64_phy) {
+>>  + val = readl(phy->pmu + REG_PMU_UNK_H3);
+>>  + writel(val & ~2, phy->pmu + REG_PMU_UNK_H3);
+>>  + }
+>>  +
 >
 > This bit is also set for H3, shall we reuse it or we should enclose it
 > in else-if part ?
@@ -21,3 +21,8 @@ I'm not so familiar about the tradition of Linux kernel coding style...
 >
 > Thanks
 > Amit.
+
+_______________________________________________
+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 05d89d2..463fa08 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,24 @@
  "ref\020160731112536.4625-1-icenowy@aosc.xyz\0"
  "ref\020160731112536.4625-2-icenowy@aosc.xyz\0"
  "ref\0CABHD4K9awH3moyCktEq3acYN=GS74nhThuFDsYt10UTqOHSw3Q@mail.gmail.com\0"
- "From\0icenowy@aosc.xyz (Icenowy Zheng)\0"
- "Subject\0[PATCH 2/3] phy: sun4i: add support for A64 usb phy\0"
+ "From\0Icenowy Zheng <icenowy@aosc.xyz>\0"
+ "Subject\0Re: [PATCH 2/3] phy: sun4i: add support for A64 usb phy\0"
  "Date\0Sun, 31 Jul 2016 21:18:12 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Amit Tomer <amittomer25@gmail.com>\0"
+ "Cc\0Mark Rutland <mark.rutland@arm.com>"
+  devicetree@vger.kernel.org <devicetree@vger.kernel.org>
+  Reinder de Haan <patchesrdh@mveas.com>
+  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+  linux-usb@vger.kernel.org <linux-usb@vger.kernel.org>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+  Kishon Vijay Abraham I <kishon@ti.com>
+  Tony Prisk <linux@prisktech.co.nz>
+  Hans de Goede <hdegoede@redhat.com>
+  Chen-Yu Tsai <wens@csie.org>
+  Rob Herring <robh+dt@kernel.org>
+  Alan Stern <stern@rowland.harvard.edu>
+  Maxime Ripard <maxime.ripard@free-electrons.com>
+ " linux-arm-kernel <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "\n"
@@ -12,16 +26,16 @@
  "31.07.2016, 20:39, \"Amit Tomer\" <amittomer25@gmail.com>:\n"
  "> Hello ,\n"
  ">\n"
- ">> ?@@ -264,6 +266,12 @@ static int sun4i_usb_phy_init(struct phy *_phy)\n"
- ">> ?????????????????val = readl(phy->pmu + REG_PMU_UNK_H3);\n"
- ">> ?????????????????writel(val & ~2, phy->pmu + REG_PMU_UNK_H3);\n"
- ">> ?????????} else {\n"
- ">> ?+ /* A64 needs also this unknown bit */\n"
- ">> ?+ if (data->cfg->type == sun50i_a64_phy) {\n"
- ">> ?+ val = readl(phy->pmu + REG_PMU_UNK_H3);\n"
- ">> ?+ writel(val & ~2, phy->pmu + REG_PMU_UNK_H3);\n"
- ">> ?+ }\n"
- ">> ?+\n"
+ ">> \302\240@@ -264,6 +266,12 @@ static int sun4i_usb_phy_init(struct phy *_phy)\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\240val = readl(phy->pmu + REG_PMU_UNK_H3);\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\240writel(val & ~2, phy->pmu + REG_PMU_UNK_H3);\n"
+ ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240} else {\n"
+ ">> \302\240+ /* A64 needs also this unknown bit */\n"
+ ">> \302\240+ if (data->cfg->type == sun50i_a64_phy) {\n"
+ ">> \302\240+ val = readl(phy->pmu + REG_PMU_UNK_H3);\n"
+ ">> \302\240+ writel(val & ~2, phy->pmu + REG_PMU_UNK_H3);\n"
+ ">> \302\240+ }\n"
+ ">> \302\240+\n"
  ">\n"
  "> This bit is also set for H3, shall we reuse it or we should enclose it\n"
  "> in else-if part ?\n"
@@ -29,6 +43,11 @@
  "I'm not so familiar about the tradition of Linux kernel coding style...\n"
  ">\n"
  "> Thanks\n"
- > Amit.
+ "> Amit.\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
 
-dd8e39dce0c12260f9f3779d63c69a3ab403ecfce4a7da358cffee9311cd5d05
+14054884dad75f2c056235f4d40270a46abccc6309f64fef544266ed949dbfda
