diff for duplicates of <27711471789929@web21g.yandex.ru>

diff --git a/a/1.txt b/N1/1.txt
index 56ea99b..fc05a74 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,8 +15,8 @@ is present?
 > Changes in v3:
 > -No changes
 > ---
-> ?drivers/phy/phy-sun4i-usb.c | 4 +++-
-> ?1 file changed, 3 insertions(+), 1 deletion(-)
+>  drivers/phy/phy-sun4i-usb.c | 4 +++-
+>  1 file changed, 3 insertions(+), 1 deletion(-)
 >
 > diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c
 > index af42f8d..03f030b 100644
@@ -24,20 +24,25 @@ is present?
 > +++ b/drivers/phy/phy-sun4i-usb.c
 > @@ -390,8 +390,10 @@ static int sun4i_usb_phy_power_on(struct phy *_phy)
 >
-> ?????????/* For phy0 only turn on Vbus if we don't have an ext. Vbus */
-> ?????????if (phy->index == 0 && sun4i_usb_phy0_have_vbus_det(data) &&
+>          /* For phy0 only turn on Vbus if we don't have an ext. Vbus */
+>          if (phy->index == 0 && sun4i_usb_phy0_have_vbus_det(data) &&
 > - data->vbus_det)
 > + data->vbus_det) {
 > + dev_warn(&_phy->dev, "External vbus detected, not enabling our own vbus\n");
-> ?????????????????return 0;
+>                  return 0;
 > + }
 >
-> ?????????ret = regulator_enable(phy->vbus);
-> ?????????if (ret)
+>          ret = regulator_enable(phy->vbus);
+>          if (ret)
 > --
 > 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 a502c7b..9a91604 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,17 @@
  "ref\01471781799-10457-1-git-send-email-hdegoede@redhat.com\0"
  "ref\01471781799-10457-5-git-send-email-hdegoede@redhat.com\0"
- "From\0icenowy@aosc.xyz (Icenowy Zheng)\0"
- "Subject\0[PATCH v3 5/7] phy-sun4i-usb: Warn when external vbus is detected\0"
+ "From\0Icenowy Zheng <icenowy@aosc.xyz>\0"
+ "Subject\0Re: [PATCH v3 5/7] phy-sun4i-usb: Warn when external vbus is detected\0"
  "Date\0Sun, 21 Aug 2016 22:32:09 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Hans de Goede <hdegoede@redhat.com>"
+  Bin Liu <b-liu@ti.com>
+  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ " Kishon Vijay Abraham I <kishon@ti.com>\0"
+ "Cc\0devicetree <devicetree@vger.kernel.org>"
+  Chen-Yu Tsai <wens@csie.org>
+  linux-usb@vger.kernel.org <linux-usb@vger.kernel.org>
+  Maxime Ripard <maxime.ripard@free-electrons.com>
+ " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "\n"
@@ -23,8 +31,8 @@
  "> Changes in v3:\n"
  "> -No changes\n"
  "> ---\n"
- "> ?drivers/phy/phy-sun4i-usb.c | 4 +++-\n"
- "> ?1 file changed, 3 insertions(+), 1 deletion(-)\n"
+ "> \302\240drivers/phy/phy-sun4i-usb.c | 4 +++-\n"
+ "> \302\2401 file changed, 3 insertions(+), 1 deletion(-)\n"
  ">\n"
  "> diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c\n"
  "> index af42f8d..03f030b 100644\n"
@@ -32,22 +40,27 @@
  "> +++ b/drivers/phy/phy-sun4i-usb.c\n"
  "> @@ -390,8 +390,10 @@ static int sun4i_usb_phy_power_on(struct phy *_phy)\n"
  ">\n"
- "> ?????????/* For phy0 only turn on Vbus if we don't have an ext. Vbus */\n"
- "> ?????????if (phy->index == 0 && sun4i_usb_phy0_have_vbus_det(data) &&\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240/* For phy0 only turn on Vbus if we don't have an ext. Vbus */\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (phy->index == 0 && sun4i_usb_phy0_have_vbus_det(data) &&\n"
  "> - data->vbus_det)\n"
  "> + data->vbus_det) {\n"
  "> + dev_warn(&_phy->dev, \"External vbus detected, not enabling our own vbus\\n\");\n"
- "> ?????????????????return 0;\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\240return 0;\n"
  "> + }\n"
  ">\n"
- "> ?????????ret = regulator_enable(phy->vbus);\n"
- "> ?????????if (ret)\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240ret = regulator_enable(phy->vbus);\n"
+ "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (ret)\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
 
-e59ad12b8e195663d17dc375ea80b214c6791c11e0d90985be317199497d62f1
+4a8abb5dc7e9326a28e28156adbcef28bf0abdd43c09c66246abb66de4c13ef2
