diff for duplicates of <57203309.1090501@huawei.com>

diff --git a/a/1.txt b/N1/1.txt
index 3379999..a6a5dbd 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,7 +11,7 @@ Thanks,
 
 Yisen
 
-? 2016/4/26 20:48, Rob Herring ??:
+在 2016/4/26 20:48, Rob Herring 写道:
 > On Sat, Apr 23, 2016 at 05:05:15PM +0800, Yisen Zhuang wrote:
 >> Because debug dsaf port was separated from service dsaf port, this patch
 >> updates the related information of DT binding.
@@ -156,7 +156,7 @@ Agree, thanks.
 >>  [1] Documentation/devicetree/bindings/net/phy.txt
 >>  
 >>  Example:
->> @@ -28,11 +56,11 @@ dsaf0: dsa at c7000000 {
+>> @@ -28,11 +56,11 @@ dsaf0: dsa@c7000000 {
 >>  	compatible = "hisilicon,hns-dsaf-v1";
 >>  	mode = "6port-16rss";
 >>  	interrupt-parent = <&mbigen_dsa>;
@@ -172,12 +172,12 @@ Agree, thanks.
 >>  	interrupts = <131 4>,<132 4>, <133 4>,<134 4>,
 >>  		     <135 4>,<136 4>, <137 4>,<138 4>,
 >>  		     <139 4>,<140 4>, <141 4>,<142 4>,
->> @@ -43,4 +71,15 @@ dsaf0: dsa at c7000000 {
+>> @@ -43,4 +71,15 @@ dsaf0: dsa@c7000000 {
 >>  	buf-size = <4096>;
 >>  	desc-num = <1024>;
 >>  	dma-coherent;
 >> +
->> +	prot at 0 {
+>> +	prot@0 {
 > 
 > port?
 
@@ -190,7 +190,7 @@ thank you very much.
 >> +		serdes-syscon = <&serdes>;
 >> +	};
 >> +
->> +	prot at 1 {
+>> +	prot@1 {
 >> +                port-id = 1;
 >> +                serdes-syscon = <&serdes>;
 >> +        };
@@ -200,4 +200,10 @@ thank you very much.
 >>
 > 
 > .
->
+> 
+
+
+_______________________________________________
+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 b885eba..3233333 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,28 @@
  "ref\01461402317-136499-1-git-send-email-Yisen.Zhuang@huawei.com\0"
  "ref\01461402317-136499-12-git-send-email-Yisen.Zhuang@huawei.com\0"
  "ref\020160426124847.GA26682@rob-hp-laptop\0"
- "From\0Yisen.zhuang@huawei.com (Yisen Zhuang)\0"
- "Subject\0[PATCH v2 net-next 11/13] Documentation: Bindings: Update DT binding for separating dsaf dev support\0"
+ "From\0Yisen Zhuang <Yisen.zhuang@huawei.com>\0"
+ "Subject\0Re: [PATCH v2 net-next 11/13] Documentation: Bindings: Update DT binding for separating dsaf dev support\0"
  "Date\0Wed, 27 Apr 2016 11:33:29 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Rob Herring <robh@kernel.org>"
+ " davem@davemloft.net\0"
+ "Cc\0mark.rutland@arm.com"
+  devicetree@vger.kernel.org
+  salil.mehta@huawei.com
+  catalin.marinas@arm.com
+  xieqianqian@huawei.com
+  pawel.moll@arm.com
+  ijc+devicetree@hellion.org.uk
+  netdev@vger.kernel.org
+  lipeng321@huawei.com
+  will.deacon@arm.com
+  linuxarm@huawei.com
+  xuwei5@hisilicon.com
+  huangdaode@hisilicon.com
+  galak@codeaurora.org
+  yankejian@huawei.com
+  linux-arm-kernel@lists.infradead.org
+ " liguozhu@huawei.com\0"
  "\00:1\0"
  "b\0"
  "Hi Rob and David,\n"
@@ -20,7 +38,7 @@
  "\n"
  "Yisen\n"
  "\n"
- "? 2016/4/26 20:48, Rob Herring ??:\n"
+ "\345\234\250 2016/4/26 20:48, Rob Herring \345\206\231\351\201\223:\n"
  "> On Sat, Apr 23, 2016 at 05:05:15PM +0800, Yisen Zhuang wrote:\n"
  ">> Because debug dsaf port was separated from service dsaf port, this patch\n"
  ">> updates the related information of DT binding.\n"
@@ -165,7 +183,7 @@
  ">>  [1] Documentation/devicetree/bindings/net/phy.txt\n"
  ">>  \n"
  ">>  Example:\n"
- ">> @@ -28,11 +56,11 @@ dsaf0: dsa at c7000000 {\n"
+ ">> @@ -28,11 +56,11 @@ dsaf0: dsa@c7000000 {\n"
  ">>  \tcompatible = \"hisilicon,hns-dsaf-v1\";\n"
  ">>  \tmode = \"6port-16rss\";\n"
  ">>  \tinterrupt-parent = <&mbigen_dsa>;\n"
@@ -181,12 +199,12 @@
  ">>  \tinterrupts = <131 4>,<132 4>, <133 4>,<134 4>,\n"
  ">>  \t\t     <135 4>,<136 4>, <137 4>,<138 4>,\n"
  ">>  \t\t     <139 4>,<140 4>, <141 4>,<142 4>,\n"
- ">> @@ -43,4 +71,15 @@ dsaf0: dsa at c7000000 {\n"
+ ">> @@ -43,4 +71,15 @@ dsaf0: dsa@c7000000 {\n"
  ">>  \tbuf-size = <4096>;\n"
  ">>  \tdesc-num = <1024>;\n"
  ">>  \tdma-coherent;\n"
  ">> +\n"
- ">> +\tprot at 0 {\n"
+ ">> +\tprot@0 {\n"
  "> \n"
  "> port?\n"
  "\n"
@@ -199,7 +217,7 @@
  ">> +\t\tserdes-syscon = <&serdes>;\n"
  ">> +\t};\n"
  ">> +\n"
- ">> +\tprot at 1 {\n"
+ ">> +\tprot@1 {\n"
  ">> +                port-id = 1;\n"
  ">> +                serdes-syscon = <&serdes>;\n"
  ">> +        };\n"
@@ -209,6 +227,12 @@
  ">>\n"
  "> \n"
  "> .\n"
- >
+ "> \n"
+ "\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
 
-efdce58f5ec4bb8853b7198bd7f0c77c0410e327083aefd51477baa6e5e40491
+26f8635566ba726511a2418b1eae5aaa9eda63506d53f4a31545b6f10d941662
