diff for duplicates of <56284F27.4010109@huawei.com> diff --git a/a/1.txt b/N1/1.txt index c9442bc..98c8c34 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,14 +1,14 @@ -? 2015/10/22 9:26, Rob Herring ??: -> On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian@huawei.com> wrote: +在 2015/10/22 9:26, Rob Herring 写道: +> On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> wrote: >> updates the bindings documents and dtsi file according to the review ->> comments from Rob Herring <robh@kernel.org> +>> comments from Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> >> ->> Signed-off-by: yankejian <yankejian@huawei.com> ->> Signed-off-by: huangdaode <huangdaode@hisilicon.com> +>> Signed-off-by: yankejian <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> +>> Signed-off-by: huangdaode <huangdaode-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org> > -> Acked-by: Rob Herring <robh@kernel.org> +> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> > Thanks! @@ -23,36 +23,36 @@ Thanks! >> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt >> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt >> @@ -12,7 +12,7 @@ Example: ->> mdio at 803c0000 { +>> mdio@803c0000 { >> #address-cells = <1>; >> #size-cells = <0>; >> - compatible = "hisilicon,mdio","hisilicon,hns-mdio"; >> + compatible = "hisilicon,hns-mdio","hisilicon,mdio"; >> reg = <0x0 0x803c0000 0x0 0x10000>; >> ->> ethernet-phy at 0 { +>> ethernet-phy@0 { >> diff --git a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi >> index 3500586..606dd5a 100644 >> --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi >> +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi ->> @@ -13,14 +13,12 @@ soc0: soc at 000000000 { +>> @@ -13,14 +13,12 @@ soc0: soc@000000000 { >> reg = <0x0 0x803c0000 0x0 0x10000 >> 0x0 0x80000000 0x0 0x10000>; >> ->> - soc0_phy4: ethernet-phy at 4 { ->> + soc0_phy0: ethernet-phy at 0 { +>> - soc0_phy4: ethernet-phy@4 { +>> + soc0_phy0: ethernet-phy@0 { >> reg = <0x0>; >> - device_type = "ethernet-phy"; >> compatible = "ethernet-phy-ieee802.3-c22"; >> }; ->> - soc0_phy5: ethernet-phy at 5 { ->> + soc0_phy1: ethernet-phy at 1 { +>> - soc0_phy5: ethernet-phy@5 { +>> + soc0_phy1: ethernet-phy@1 { >> reg = <0x1>; >> - device_type = "ethernet-phy"; >> compatible = "ethernet-phy-ieee802.3-c22"; >> }; >> }; ->> @@ -37,7 +35,7 @@ soc0: soc at 000000000 { +>> @@ -37,7 +35,7 @@ soc0: soc@000000000 { >> 0x0 0xc7000000 0x0 0x60000 >> >; >> @@ -66,8 +66,13 @@ Thanks! >> >> -- >> To unsubscribe from this list: send the line "unsubscribe devicetree" in ->> the body of a message to majordomo at vger.kernel.org +>> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . -> +> + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index b468cd0..ee89f56 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,38 @@ "ref\01445308604-95860-1-git-send-email-yankejian@huawei.com\0" "ref\0CAL_JsqJ+4BK2KDX5+t6GGEYv3pPDc+crktiMqgu6QTZi7WDrxw@mail.gmail.com\0" - "From\0yankejian@huawei.com (Yankejian (Hackim Yim))\0" - "Subject\0[PATCH RESEND net-next] net: updates HNS config and documents\0" + "ref\0CAL_JsqJ+4BK2KDX5+t6GGEYv3pPDc+crktiMqgu6QTZi7WDrxw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\0" + "From\0Yankejian (Hackim Yim) <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [PATCH RESEND net-next] net: updates HNS config and documents\0" "Date\0Thu, 22 Oct 2015 10:51:19 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "Cc\0liguozhu-hv44wF8Li93QT0dZR+AlfA@public.gmane.org" + yisen.zhuang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org + huangdaode <huangdaode-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org> + lipeng321-hv44wF8Li93QT0dZR+AlfA@public.gmane.org + David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org> + Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " linuxarm-hv44wF8Li93QT0dZR+AlfA@public.gmane.org\0" "\00:1\0" "b\0" "\n" "\n" - "? 2015/10/22 9:26, Rob Herring ??:\n" - "> On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian@huawei.com> wrote:\n" + "\345\234\250 2015/10/22 9:26, Rob Herring \345\206\231\351\201\223:\n" + "> On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> wrote:\n" ">> updates the bindings documents and dtsi file according to the review\n" - ">> comments from Rob Herring <robh@kernel.org>\n" + ">> comments from Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" ">>\n" - ">> Signed-off-by: yankejian <yankejian@huawei.com>\n" - ">> Signed-off-by: huangdaode <huangdaode@hisilicon.com>\n" + ">> Signed-off-by: yankejian <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>\n" + ">> Signed-off-by: huangdaode <huangdaode-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>\n" "> \n" - "> Acked-by: Rob Herring <robh@kernel.org>\n" + "> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" "> \n" "\n" "Thanks!\n" @@ -31,36 +47,36 @@ ">> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt\n" ">> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt\n" ">> @@ -12,7 +12,7 @@ Example:\n" - ">> mdio at 803c0000 {\n" + ">> mdio@803c0000 {\n" ">> #address-cells = <1>;\n" ">> #size-cells = <0>;\n" ">> - compatible = \"hisilicon,mdio\",\"hisilicon,hns-mdio\";\n" ">> + compatible = \"hisilicon,hns-mdio\",\"hisilicon,mdio\";\n" ">> reg = <0x0 0x803c0000 0x0 0x10000>;\n" ">>\n" - ">> ethernet-phy at 0 {\n" + ">> ethernet-phy@0 {\n" ">> diff --git a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" ">> index 3500586..606dd5a 100644\n" ">> --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" ">> +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" - ">> @@ -13,14 +13,12 @@ soc0: soc at 000000000 {\n" + ">> @@ -13,14 +13,12 @@ soc0: soc@000000000 {\n" ">> reg = <0x0 0x803c0000 0x0 0x10000\n" ">> 0x0 0x80000000 0x0 0x10000>;\n" ">>\n" - ">> - soc0_phy4: ethernet-phy at 4 {\n" - ">> + soc0_phy0: ethernet-phy at 0 {\n" + ">> - soc0_phy4: ethernet-phy@4 {\n" + ">> + soc0_phy0: ethernet-phy@0 {\n" ">> reg = <0x0>;\n" ">> - device_type = \"ethernet-phy\";\n" ">> compatible = \"ethernet-phy-ieee802.3-c22\";\n" ">> };\n" - ">> - soc0_phy5: ethernet-phy at 5 {\n" - ">> + soc0_phy1: ethernet-phy at 1 {\n" + ">> - soc0_phy5: ethernet-phy@5 {\n" + ">> + soc0_phy1: ethernet-phy@1 {\n" ">> reg = <0x1>;\n" ">> - device_type = \"ethernet-phy\";\n" ">> compatible = \"ethernet-phy-ieee802.3-c22\";\n" ">> };\n" ">> };\n" - ">> @@ -37,7 +35,7 @@ soc0: soc at 000000000 {\n" + ">> @@ -37,7 +35,7 @@ soc0: soc@000000000 {\n" ">> 0x0 0xc7000000 0x0 0x60000\n" ">> >;\n" ">>\n" @@ -74,10 +90,15 @@ ">>\n" ">> --\n" ">> To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - ">> the body of a message to majordomo at vger.kernel.org\n" + ">> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" ">> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "> \n" "> .\n" - > + "> \n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -5c8dd94cfa699b329b1c632a83bff2f988275958409055f135937caed83d22b5 +389a24c08b91b686d7f225c88827409df11c951d0183f26ede907ff0f25c24c1
diff --git a/a/1.txt b/N2/1.txt index c9442bc..40c0c65 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ -? 2015/10/22 9:26, Rob Herring ??: +在 2015/10/22 9:26, Rob Herring 写道: > On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian@huawei.com> wrote: >> updates the bindings documents and dtsi file according to the review >> comments from Rob Herring <robh@kernel.org> @@ -23,36 +23,36 @@ Thanks! >> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt >> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt >> @@ -12,7 +12,7 @@ Example: ->> mdio at 803c0000 { +>> mdio@803c0000 { >> #address-cells = <1>; >> #size-cells = <0>; >> - compatible = "hisilicon,mdio","hisilicon,hns-mdio"; >> + compatible = "hisilicon,hns-mdio","hisilicon,mdio"; >> reg = <0x0 0x803c0000 0x0 0x10000>; >> ->> ethernet-phy at 0 { +>> ethernet-phy@0 { >> diff --git a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi >> index 3500586..606dd5a 100644 >> --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi >> +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi ->> @@ -13,14 +13,12 @@ soc0: soc at 000000000 { +>> @@ -13,14 +13,12 @@ soc0: soc@000000000 { >> reg = <0x0 0x803c0000 0x0 0x10000 >> 0x0 0x80000000 0x0 0x10000>; >> ->> - soc0_phy4: ethernet-phy at 4 { ->> + soc0_phy0: ethernet-phy at 0 { +>> - soc0_phy4: ethernet-phy@4 { +>> + soc0_phy0: ethernet-phy@0 { >> reg = <0x0>; >> - device_type = "ethernet-phy"; >> compatible = "ethernet-phy-ieee802.3-c22"; >> }; ->> - soc0_phy5: ethernet-phy at 5 { ->> + soc0_phy1: ethernet-phy at 1 { +>> - soc0_phy5: ethernet-phy@5 { +>> + soc0_phy1: ethernet-phy@1 { >> reg = <0x1>; >> - device_type = "ethernet-phy"; >> compatible = "ethernet-phy-ieee802.3-c22"; >> }; >> }; ->> @@ -37,7 +35,7 @@ soc0: soc at 000000000 { +>> @@ -37,7 +35,7 @@ soc0: soc@000000000 { >> 0x0 0xc7000000 0x0 0x60000 >> >; >> @@ -66,7 +66,7 @@ Thanks! >> >> -- >> To unsubscribe from this list: send the line "unsubscribe devicetree" in ->> the body of a message to majordomo at vger.kernel.org +>> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . diff --git a/a/content_digest b/N2/content_digest index b468cd0..a485da5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,29 @@ "ref\01445308604-95860-1-git-send-email-yankejian@huawei.com\0" "ref\0CAL_JsqJ+4BK2KDX5+t6GGEYv3pPDc+crktiMqgu6QTZi7WDrxw@mail.gmail.com\0" - "From\0yankejian@huawei.com (Yankejian (Hackim Yim))\0" - "Subject\0[PATCH RESEND net-next] net: updates HNS config and documents\0" + "From\0Yankejian (Hackim Yim) <yankejian@huawei.com>\0" + "Subject\0Re: [PATCH RESEND net-next] net: updates HNS config and documents\0" "Date\0Thu, 22 Oct 2015 10:51:19 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robh+dt@kernel.org>\0" + "Cc\0<liguozhu@huawei.com>" + <yisen.zhuang@huawei.com> + huangdaode <huangdaode@hisilicon.com> + <lipeng321@huawei.com> + David Miller <davem@davemloft.net> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Catalin Marinas <catalin.marinas@arm.com> + Will Deacon <will.deacon@arm.com> + devicetree@vger.kernel.org <devicetree@vger.kernel.org> + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + " <linuxarm@huawei.com>\0" "\00:1\0" "b\0" "\n" "\n" - "? 2015/10/22 9:26, Rob Herring ??:\n" + "\345\234\250 2015/10/22 9:26, Rob Herring \345\206\231\351\201\223:\n" "> On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian@huawei.com> wrote:\n" ">> updates the bindings documents and dtsi file according to the review\n" ">> comments from Rob Herring <robh@kernel.org>\n" @@ -31,36 +46,36 @@ ">> --- a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt\n" ">> +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt\n" ">> @@ -12,7 +12,7 @@ Example:\n" - ">> mdio at 803c0000 {\n" + ">> mdio@803c0000 {\n" ">> #address-cells = <1>;\n" ">> #size-cells = <0>;\n" ">> - compatible = \"hisilicon,mdio\",\"hisilicon,hns-mdio\";\n" ">> + compatible = \"hisilicon,hns-mdio\",\"hisilicon,mdio\";\n" ">> reg = <0x0 0x803c0000 0x0 0x10000>;\n" ">>\n" - ">> ethernet-phy at 0 {\n" + ">> ethernet-phy@0 {\n" ">> diff --git a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" ">> index 3500586..606dd5a 100644\n" ">> --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" ">> +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi\n" - ">> @@ -13,14 +13,12 @@ soc0: soc at 000000000 {\n" + ">> @@ -13,14 +13,12 @@ soc0: soc@000000000 {\n" ">> reg = <0x0 0x803c0000 0x0 0x10000\n" ">> 0x0 0x80000000 0x0 0x10000>;\n" ">>\n" - ">> - soc0_phy4: ethernet-phy at 4 {\n" - ">> + soc0_phy0: ethernet-phy at 0 {\n" + ">> - soc0_phy4: ethernet-phy@4 {\n" + ">> + soc0_phy0: ethernet-phy@0 {\n" ">> reg = <0x0>;\n" ">> - device_type = \"ethernet-phy\";\n" ">> compatible = \"ethernet-phy-ieee802.3-c22\";\n" ">> };\n" - ">> - soc0_phy5: ethernet-phy at 5 {\n" - ">> + soc0_phy1: ethernet-phy at 1 {\n" + ">> - soc0_phy5: ethernet-phy@5 {\n" + ">> + soc0_phy1: ethernet-phy@1 {\n" ">> reg = <0x1>;\n" ">> - device_type = \"ethernet-phy\";\n" ">> compatible = \"ethernet-phy-ieee802.3-c22\";\n" ">> };\n" ">> };\n" - ">> @@ -37,7 +35,7 @@ soc0: soc at 000000000 {\n" + ">> @@ -37,7 +35,7 @@ soc0: soc@000000000 {\n" ">> 0x0 0xc7000000 0x0 0x60000\n" ">> >;\n" ">>\n" @@ -74,10 +89,10 @@ ">>\n" ">> --\n" ">> To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - ">> the body of a message to majordomo at vger.kernel.org\n" + ">> the body of a message to majordomo@vger.kernel.org\n" ">> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "> \n" "> .\n" > -5c8dd94cfa699b329b1c632a83bff2f988275958409055f135937caed83d22b5 +adbe9c8e3ba88a79aff0e4259f87092b25661a605e0559e1cc60dff4afe5d772
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.