diff for duplicates of <20170405172224.38c1f9fb@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 21dd8d0..3883822 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On Wed, 5 Apr 2017 16:28:24 +0200 -Andrew Lunn <andrew@lunn.ch> wrote: +Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> wrote: > On Wed, Apr 05, 2017 at 07:28:46AM +0200, Ralph Sennhauser wrote: > > The LEDs for the "wan" port are already labeled "mamba:amber:wan" @@ -75,16 +75,16 @@ index a1b6e68..3efceda 100644 #address-cells = <1>; #size-cells = <0>; -- wan_amber at 0 { +- wan_amber@0 { - label = "caiman:amber:wan"; -+ internet_amber at 0 { ++ internet_amber@0 { + label = "caiman:amber:internet"; reg = <0x0>; }; -- wan_white at 1 { +- wan_white@1 { - label = "caiman:white:wan"; -+ internet_white at 1 { ++ internet_white@1 { + label = "caiman:white:internet"; reg = <0x1>; }; @@ -97,16 +97,16 @@ index a1a75af..4f2e7f6 100644 #address-cells = <1>; #size-cells = <0>; -- wan_amber at 0 { +- wan_amber@0 { - label = "cobra:amber:wan"; -+ internet_amber at 0 { ++ internet_amber@0 { + label = "cobra:amber:internet"; reg = <0x0>; }; -- wan_white at 1 { +- wan_white@1 { - label = "cobra:white:wan"; -+ internet_white at 1 { ++ internet_white@1 { + label = "cobra:white:internet"; reg = <0x1>; }; @@ -119,16 +119,16 @@ index c7a8ddd..a7b47f7 100644 #address-cells = <1>; #size-cells = <0>; -- wan_amber at 0 { +- wan_amber@0 { - label = "shelby:amber:wan"; -+ internet_amber at 0 { ++ internet_amber@0 { + label = "shelby:amber:internet"; reg = <0x0>; }; -- wan_white at 1 { +- wan_white@1 { - label = "shelby:white:wan"; -+ internet_white at 1 { ++ internet_white@1 { + label = "shelby:white:internet"; reg = <0x1>; }; @@ -139,22 +139,22 @@ index aa0d225..8460066 100644 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -145,7 +145,7 @@ - port at 4 { + port@4 { reg = <4>; - label = "wan"; + label = "internet"; }; - port at 5 { + port@5 { @@ -360,7 +360,7 @@ - port at 4 { + port@4 { reg = <4>; - label = "wan"; + label = "internet"; }; - port at 5 { + port@5 { diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts index 9efcf59..ed2fe8f 100644 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts @@ -163,16 +163,21 @@ index 9efcf59..ed2fe8f 100644 compatible = "ti,tlc59116"; reg = <0x68>; -- wan_amber at 0 { +- wan_amber@0 { - label = "mamba:amber:wan"; -+ internet_amber at 0 { ++ internet_amber@0 { + label = "mamba:amber:internet"; reg = <0x0>; }; -- wan_white at 1 { +- wan_white@1 { - label = "mamba:white:wan"; -+ internet_white at 1 { ++ internet_white@1 { + label = "mamba:white:internet"; reg = <0x1>; }; + +-- +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 931315d..a645c9a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,23 @@ "ref\020170405052847.326-1-ralph.sennhauser@gmail.com\0" "ref\020170405142824.GB13449@lunn.ch\0" - "From\0ralph.sennhauser@gmail.com (Ralph Sennhauser)\0" - "Subject\0[PATCH 1/1] ARM: dts: armada-xp-linksys-mamba: use wan instead of internet for DSA port\0" + "ref\020170405142824.GB13449-g2DYL2Zd6BY@public.gmane.org\0" + "From\0Ralph Sennhauser <ralph.sennhauser-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH 1/1] ARM: dts: armada-xp-linksys-mamba: use wan instead of internet for DSA port\0" "Date\0Wed, 5 Apr 2017 17:22:24 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + " Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "\00:1\0" "b\0" "On Wed, 5 Apr 2017 16:28:24 +0200\n" - "Andrew Lunn <andrew@lunn.ch> wrote:\n" + "Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> wrote:\n" "\n" "> On Wed, Apr 05, 2017 at 07:28:46AM +0200, Ralph Sennhauser wrote:\n" "> > The LEDs for the \"wan\" port are already labeled \"mamba:amber:wan\"\n" @@ -83,16 +93,16 @@ " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \n" - "-\t\t\t\t\twan_amber at 0 {\n" + "-\t\t\t\t\twan_amber@0 {\n" "-\t\t\t\t\t\tlabel = \"caiman:amber:wan\";\n" - "+\t\t\t\t\tinternet_amber at 0 {\n" + "+\t\t\t\t\tinternet_amber@0 {\n" "+\t\t\t\t\t\tlabel = \"caiman:amber:internet\";\n" " \t\t\t\t\t\treg = <0x0>;\n" " \t\t\t\t\t};\n" " \n" - "-\t\t\t\t\twan_white at 1 {\n" + "-\t\t\t\t\twan_white@1 {\n" "-\t\t\t\t\t\tlabel = \"caiman:white:wan\";\n" - "+\t\t\t\t\tinternet_white at 1 {\n" + "+\t\t\t\t\tinternet_white@1 {\n" "+\t\t\t\t\t\tlabel = \"caiman:white:internet\";\n" " \t\t\t\t\t\treg = <0x1>;\n" " \t\t\t\t\t};\n" @@ -105,16 +115,16 @@ " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \n" - "-\t\t\t\t\twan_amber at 0 {\n" + "-\t\t\t\t\twan_amber@0 {\n" "-\t\t\t\t\t\tlabel = \"cobra:amber:wan\";\n" - "+\t\t\t\t\tinternet_amber at 0 {\n" + "+\t\t\t\t\tinternet_amber@0 {\n" "+\t\t\t\t\t\tlabel = \"cobra:amber:internet\";\n" " \t\t\t\t\t\treg = <0x0>;\n" " \t\t\t\t\t};\n" " \n" - "-\t\t\t\t\twan_white at 1 {\n" + "-\t\t\t\t\twan_white@1 {\n" "-\t\t\t\t\t\tlabel = \"cobra:white:wan\";\n" - "+\t\t\t\t\tinternet_white at 1 {\n" + "+\t\t\t\t\tinternet_white@1 {\n" "+\t\t\t\t\t\tlabel = \"cobra:white:internet\";\n" " \t\t\t\t\t\treg = <0x1>;\n" " \t\t\t\t\t};\n" @@ -127,16 +137,16 @@ " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \n" - "-\t\t\t\t\twan_amber at 0 {\n" + "-\t\t\t\t\twan_amber@0 {\n" "-\t\t\t\t\t\tlabel = \"shelby:amber:wan\";\n" - "+\t\t\t\t\tinternet_amber at 0 {\n" + "+\t\t\t\t\tinternet_amber@0 {\n" "+\t\t\t\t\t\tlabel = \"shelby:amber:internet\";\n" " \t\t\t\t\t\treg = <0x0>;\n" " \t\t\t\t\t};\n" " \n" - "-\t\t\t\t\twan_white at 1 {\n" + "-\t\t\t\t\twan_white@1 {\n" "-\t\t\t\t\t\tlabel = \"shelby:white:wan\";\n" - "+\t\t\t\t\tinternet_white at 1 {\n" + "+\t\t\t\t\tinternet_white@1 {\n" "+\t\t\t\t\t\tlabel = \"shelby:white:internet\";\n" " \t\t\t\t\t\treg = <0x1>;\n" " \t\t\t\t\t};\n" @@ -147,22 +157,22 @@ "+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi\n" "@@ -145,7 +145,7 @@\n" " \n" - " \t\t\t\t\t\tport at 4 {\n" + " \t\t\t\t\t\tport@4 {\n" " \t\t\t\t\t\t\treg = <4>;\n" "-\t\t\t\t\t\t\tlabel = \"wan\";\n" "+\t\t\t\t\t\t\tlabel = \"internet\";\n" " \t\t\t\t\t\t};\n" " \n" - " \t\t\t\t\t\tport at 5 {\n" + " \t\t\t\t\t\tport@5 {\n" "@@ -360,7 +360,7 @@\n" " \n" - " \t\t\tport at 4 {\n" + " \t\t\tport@4 {\n" " \t\t\t\treg = <4>;\n" "-\t\t\t\tlabel = \"wan\";\n" "+\t\t\t\tlabel = \"internet\";\n" " \t\t\t};\n" " \n" - " \t\t\tport at 5 {\n" + " \t\t\tport@5 {\n" "diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts\n" "index 9efcf59..ed2fe8f 100644\n" "--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts\n" @@ -171,18 +181,23 @@ " \t\t\t\t\tcompatible = \"ti,tlc59116\";\n" " \t\t\t\t\treg = <0x68>;\n" " \n" - "-\t\t\t\t\twan_amber at 0 {\n" + "-\t\t\t\t\twan_amber@0 {\n" "-\t\t\t\t\t\tlabel = \"mamba:amber:wan\";\n" - "+\t\t\t\t\tinternet_amber at 0 {\n" + "+\t\t\t\t\tinternet_amber@0 {\n" "+\t\t\t\t\t\tlabel = \"mamba:amber:internet\";\n" " \t\t\t\t\t\treg = <0x0>;\n" " \t\t\t\t\t};\n" " \n" - "-\t\t\t\t\twan_white at 1 {\n" + "-\t\t\t\t\twan_white@1 {\n" "-\t\t\t\t\t\tlabel = \"mamba:white:wan\";\n" - "+\t\t\t\t\tinternet_white at 1 {\n" + "+\t\t\t\t\tinternet_white@1 {\n" "+\t\t\t\t\t\tlabel = \"mamba:white:internet\";\n" " \t\t\t\t\t\treg = <0x1>;\n" - " \t\t\t\t\t};" + " \t\t\t\t\t};\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 -d35f8e2425d3668a309fffb5e4220fdab56b9cbd2b2da0702791ba948b938379 +5e29a444a5979887df237b3b9bed7876da7a2a3c47ef99a5fb532b032711d6ab
diff --git a/a/1.txt b/N2/1.txt index 21dd8d0..c03c881 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -75,16 +75,16 @@ index a1b6e68..3efceda 100644 #address-cells = <1>; #size-cells = <0>; -- wan_amber at 0 { +- wan_amber@0 { - label = "caiman:amber:wan"; -+ internet_amber at 0 { ++ internet_amber@0 { + label = "caiman:amber:internet"; reg = <0x0>; }; -- wan_white at 1 { +- wan_white@1 { - label = "caiman:white:wan"; -+ internet_white at 1 { ++ internet_white@1 { + label = "caiman:white:internet"; reg = <0x1>; }; @@ -97,16 +97,16 @@ index a1a75af..4f2e7f6 100644 #address-cells = <1>; #size-cells = <0>; -- wan_amber at 0 { +- wan_amber@0 { - label = "cobra:amber:wan"; -+ internet_amber at 0 { ++ internet_amber@0 { + label = "cobra:amber:internet"; reg = <0x0>; }; -- wan_white at 1 { +- wan_white@1 { - label = "cobra:white:wan"; -+ internet_white at 1 { ++ internet_white@1 { + label = "cobra:white:internet"; reg = <0x1>; }; @@ -119,16 +119,16 @@ index c7a8ddd..a7b47f7 100644 #address-cells = <1>; #size-cells = <0>; -- wan_amber at 0 { +- wan_amber@0 { - label = "shelby:amber:wan"; -+ internet_amber at 0 { ++ internet_amber@0 { + label = "shelby:amber:internet"; reg = <0x0>; }; -- wan_white at 1 { +- wan_white@1 { - label = "shelby:white:wan"; -+ internet_white at 1 { ++ internet_white@1 { + label = "shelby:white:internet"; reg = <0x1>; }; @@ -139,22 +139,22 @@ index aa0d225..8460066 100644 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -145,7 +145,7 @@ - port at 4 { + port@4 { reg = <4>; - label = "wan"; + label = "internet"; }; - port at 5 { + port@5 { @@ -360,7 +360,7 @@ - port at 4 { + port@4 { reg = <4>; - label = "wan"; + label = "internet"; }; - port at 5 { + port@5 { diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts index 9efcf59..ed2fe8f 100644 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts @@ -163,16 +163,16 @@ index 9efcf59..ed2fe8f 100644 compatible = "ti,tlc59116"; reg = <0x68>; -- wan_amber at 0 { +- wan_amber@0 { - label = "mamba:amber:wan"; -+ internet_amber at 0 { ++ internet_amber@0 { + label = "mamba:amber:internet"; reg = <0x0>; }; -- wan_white at 1 { +- wan_white@1 { - label = "mamba:white:wan"; -+ internet_white at 1 { ++ internet_white@1 { + label = "mamba:white:internet"; reg = <0x1>; }; diff --git a/a/content_digest b/N2/content_digest index 931315d..e8c332d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,18 @@ "ref\020170405052847.326-1-ralph.sennhauser@gmail.com\0" "ref\020170405142824.GB13449@lunn.ch\0" - "From\0ralph.sennhauser@gmail.com (Ralph Sennhauser)\0" - "Subject\0[PATCH 1/1] ARM: dts: armada-xp-linksys-mamba: use wan instead of internet for DSA port\0" + "From\0Ralph Sennhauser <ralph.sennhauser@gmail.com>\0" + "Subject\0Re: [PATCH 1/1] ARM: dts: armada-xp-linksys-mamba: use wan instead of internet for DSA port\0" "Date\0Wed, 5 Apr 2017 17:22:24 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Andrew Lunn <andrew@lunn.ch>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + Mark Rutland <mark.rutland@arm.com> + Jason Cooper <jason@lakedaemon.net> + devicetree@vger.kernel.org + Russell King <linux@armlinux.org.uk> + linux-kernel@vger.kernel.org + Gregory Clement <gregory.clement@free-electrons.com> + Rob Herring <robh+dt@kernel.org> + " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" "\00:1\0" "b\0" "On Wed, 5 Apr 2017 16:28:24 +0200\n" @@ -83,16 +92,16 @@ " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \n" - "-\t\t\t\t\twan_amber at 0 {\n" + "-\t\t\t\t\twan_amber@0 {\n" "-\t\t\t\t\t\tlabel = \"caiman:amber:wan\";\n" - "+\t\t\t\t\tinternet_amber at 0 {\n" + "+\t\t\t\t\tinternet_amber@0 {\n" "+\t\t\t\t\t\tlabel = \"caiman:amber:internet\";\n" " \t\t\t\t\t\treg = <0x0>;\n" " \t\t\t\t\t};\n" " \n" - "-\t\t\t\t\twan_white at 1 {\n" + "-\t\t\t\t\twan_white@1 {\n" "-\t\t\t\t\t\tlabel = \"caiman:white:wan\";\n" - "+\t\t\t\t\tinternet_white at 1 {\n" + "+\t\t\t\t\tinternet_white@1 {\n" "+\t\t\t\t\t\tlabel = \"caiman:white:internet\";\n" " \t\t\t\t\t\treg = <0x1>;\n" " \t\t\t\t\t};\n" @@ -105,16 +114,16 @@ " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \n" - "-\t\t\t\t\twan_amber at 0 {\n" + "-\t\t\t\t\twan_amber@0 {\n" "-\t\t\t\t\t\tlabel = \"cobra:amber:wan\";\n" - "+\t\t\t\t\tinternet_amber at 0 {\n" + "+\t\t\t\t\tinternet_amber@0 {\n" "+\t\t\t\t\t\tlabel = \"cobra:amber:internet\";\n" " \t\t\t\t\t\treg = <0x0>;\n" " \t\t\t\t\t};\n" " \n" - "-\t\t\t\t\twan_white at 1 {\n" + "-\t\t\t\t\twan_white@1 {\n" "-\t\t\t\t\t\tlabel = \"cobra:white:wan\";\n" - "+\t\t\t\t\tinternet_white at 1 {\n" + "+\t\t\t\t\tinternet_white@1 {\n" "+\t\t\t\t\t\tlabel = \"cobra:white:internet\";\n" " \t\t\t\t\t\treg = <0x1>;\n" " \t\t\t\t\t};\n" @@ -127,16 +136,16 @@ " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \n" - "-\t\t\t\t\twan_amber at 0 {\n" + "-\t\t\t\t\twan_amber@0 {\n" "-\t\t\t\t\t\tlabel = \"shelby:amber:wan\";\n" - "+\t\t\t\t\tinternet_amber at 0 {\n" + "+\t\t\t\t\tinternet_amber@0 {\n" "+\t\t\t\t\t\tlabel = \"shelby:amber:internet\";\n" " \t\t\t\t\t\treg = <0x0>;\n" " \t\t\t\t\t};\n" " \n" - "-\t\t\t\t\twan_white at 1 {\n" + "-\t\t\t\t\twan_white@1 {\n" "-\t\t\t\t\t\tlabel = \"shelby:white:wan\";\n" - "+\t\t\t\t\tinternet_white at 1 {\n" + "+\t\t\t\t\tinternet_white@1 {\n" "+\t\t\t\t\t\tlabel = \"shelby:white:internet\";\n" " \t\t\t\t\t\treg = <0x1>;\n" " \t\t\t\t\t};\n" @@ -147,22 +156,22 @@ "+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi\n" "@@ -145,7 +145,7 @@\n" " \n" - " \t\t\t\t\t\tport at 4 {\n" + " \t\t\t\t\t\tport@4 {\n" " \t\t\t\t\t\t\treg = <4>;\n" "-\t\t\t\t\t\t\tlabel = \"wan\";\n" "+\t\t\t\t\t\t\tlabel = \"internet\";\n" " \t\t\t\t\t\t};\n" " \n" - " \t\t\t\t\t\tport at 5 {\n" + " \t\t\t\t\t\tport@5 {\n" "@@ -360,7 +360,7 @@\n" " \n" - " \t\t\tport at 4 {\n" + " \t\t\tport@4 {\n" " \t\t\t\treg = <4>;\n" "-\t\t\t\tlabel = \"wan\";\n" "+\t\t\t\tlabel = \"internet\";\n" " \t\t\t};\n" " \n" - " \t\t\tport at 5 {\n" + " \t\t\tport@5 {\n" "diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts\n" "index 9efcf59..ed2fe8f 100644\n" "--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts\n" @@ -171,18 +180,18 @@ " \t\t\t\t\tcompatible = \"ti,tlc59116\";\n" " \t\t\t\t\treg = <0x68>;\n" " \n" - "-\t\t\t\t\twan_amber at 0 {\n" + "-\t\t\t\t\twan_amber@0 {\n" "-\t\t\t\t\t\tlabel = \"mamba:amber:wan\";\n" - "+\t\t\t\t\tinternet_amber at 0 {\n" + "+\t\t\t\t\tinternet_amber@0 {\n" "+\t\t\t\t\t\tlabel = \"mamba:amber:internet\";\n" " \t\t\t\t\t\treg = <0x0>;\n" " \t\t\t\t\t};\n" " \n" - "-\t\t\t\t\twan_white at 1 {\n" + "-\t\t\t\t\twan_white@1 {\n" "-\t\t\t\t\t\tlabel = \"mamba:white:wan\";\n" - "+\t\t\t\t\tinternet_white at 1 {\n" + "+\t\t\t\t\tinternet_white@1 {\n" "+\t\t\t\t\t\tlabel = \"mamba:white:internet\";\n" " \t\t\t\t\t\treg = <0x1>;\n" " \t\t\t\t\t};" -d35f8e2425d3668a309fffb5e4220fdab56b9cbd2b2da0702791ba948b938379 +47e03630016440f5433d8562d63208f7c3df4e52b254740426867bde0f0adb11
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.