diff for duplicates of <1468679348-10522-7-git-send-email-jm@lentin.co.uk>
diff --git a/a/content_digest b/N1/content_digest
index d3f03b5..336f965 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -20,10 +20,10 @@
]
[
"Cc\0devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " netdev\@vger.kernel.org",
+ " Jamie Lentin <jm\@lentin.co.uk>",
" linux-kernel\@vger.kernel.org",
- " Jamie Lentin <jm\@lentin.co.uk>\0"
+ " linux-arm-kernel\@lists.infradead.org",
+ " netdev\@vger.kernel.org\0"
]
[
"\0000:1\0"
@@ -390,4 +390,4 @@
"2.8.1"
]
-de89e4dd4f75485eb04d18b7868ae9ae93a77080e3b0f142a633c76a71192746
+ed761a29c54c0b4bfaaa89fe68abaa666e7d097695c87111926ce651ede283cd
diff --git a/a/1.txt b/N2/1.txt
index 0d05268..fbcf878 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -93,23 +93,23 @@ index 0000000..a8e89d8
+ pinctrl-0 = <&pmx_power_led &pmx_power_led_blink &pmx_wan_led>;
+ pinctrl-names = "default";
+
-+ led@0 {
++ led at 0 {
+ label = "power:green";
+ gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+ };
+
-+ led@1 {
++ led at 1 {
+ label = "power:blink";
+ gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+ };
+
-+ led@2 {
++ led at 2 {
+ label = "wan:green";
+ gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+ };
+ };
+
-+ dsa@0 {
++ dsa at 0 {
+ compatible = "marvell,dsa";
+ #address-cells = <1>;
+ #size-cells = <0>;
@@ -117,37 +117,37 @@ index 0000000..a8e89d8
+ dsa,ethernet = <ðport>;
+ dsa,mii-bus = <&mdio>;
+
-+ switch@0 {
++ switch at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0 0>; /* MDIO address 0, switch 0 in tree */
+
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ label = "lan3";
+ };
+
-+ port@1 {
++ port at 1 {
+ reg = <1>;
+ label = "lan4";
+ };
+
-+ port@2 {
++ port at 2 {
+ reg = <2>;
+ label = "wan";
+ };
+
-+ port@3 {
++ port at 3 {
+ reg = <3>;
+ label = "cpu";
+ };
+
-+ port@5 {
++ port at 5 {
+ reg = <5>;
+ label = "lan1";
+ };
+
-+ port@7 {
++ port at 7 {
+ reg = <7>;
+ label = "lan2";
+ };
@@ -160,29 +160,29 @@ index 0000000..a8e89d8
+
+ devbus,keep-config;
+
-+ flash@0 {
++ flash at 0 {
+ compatible = "cfi-flash";
+ reg = <0 0x800000>;
+ bank-width = <1>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "kernel";
+ reg = <0x0 0x100000>;
+ };
+
-+ partition@100000 {
++ partition at 100000 {
+ label = "rootfs";
+ reg = <0x100000 0x660000>;
+ };
+
-+ partition@760000 {
++ partition at 760000 {
+ label = "uboot_env";
+ reg = <0x760000 0x20000>;
+ };
+
-+ partition@780000 {
++ partition at 780000 {
+ label = "uboot";
+ reg = <0x780000 0x80000>;
+ read-only;
@@ -196,7 +196,7 @@ index 0000000..a8e89d8
+
+ð {
+ status = "okay";
-+ ethernet-port@0 {
++ ethernet-port at 0 {
+ speed = <1000>;
+ duplex = <1>;
+ };
diff --git a/a/content_digest b/N2/content_digest
index d3f03b5..aac4f34 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001468679348-10522-1-git-send-email-jm\@lentin.co.uk\0"
]
[
- "From\0Jamie Lentin <jm\@lentin.co.uk>\0"
+ "From\0jm\@lentin.co.uk (Jamie Lentin)\0"
]
[
"Subject\0[PATCH v0 06/10] arm: orion5x: Add DT-based support for Netgear WNR854T\0"
@@ -11,19 +11,7 @@
"Date\0Sat, 16 Jul 2016 15:29:04 +0100\0"
]
[
- "To\0Jason Cooper <jason\@lakedaemon.net>",
- " Andrew Lunn <andrew\@lunn.ch>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Gregory Clement <gregory.clement\@free-electrons.com>",
- " Imre Kaloz <kaloz\@openwrt.org>",
- " Florian Fainelli <f.fainelli\@gmail.com>\0"
-]
-[
- "Cc\0devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " netdev\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Jamie Lentin <jm\@lentin.co.uk>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -127,23 +115,23 @@
"+\t\tpinctrl-0 = <&pmx_power_led &pmx_power_led_blink &pmx_wan_led>;\n",
"+\t\tpinctrl-names = \"default\";\n",
"+\n",
- "+\t\tled\@0 {\n",
+ "+\t\tled at 0 {\n",
"+\t\t\tlabel = \"power:green\";\n",
"+\t\t\tgpios = <&gpio0 0 GPIO_ACTIVE_LOW>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tled\@1 {\n",
+ "+\t\tled at 1 {\n",
"+\t\t\tlabel = \"power:blink\";\n",
"+\t\t\tgpios = <&gpio0 2 GPIO_ACTIVE_LOW>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tled\@2 {\n",
+ "+\t\tled at 2 {\n",
"+\t\t\tlabel = \"wan:green\";\n",
"+\t\t\tgpios = <&gpio0 3 GPIO_ACTIVE_LOW>;\n",
"+\t\t};\n",
"+\t};\n",
"+\n",
- "+\tdsa\@0 {\n",
+ "+\tdsa at 0 {\n",
"+\t\tcompatible = \"marvell,dsa\";\n",
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <0>;\n",
@@ -151,37 +139,37 @@
"+\t\tdsa,ethernet = <ðport>;\n",
"+\t\tdsa,mii-bus = <&mdio>;\n",
"+\n",
- "+\t\tswitch\@0 {\n",
+ "+\t\tswitch at 0 {\n",
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <0>;\n",
"+\t\t\treg = <0 0>;\t/* MDIO address 0, switch 0 in tree */\n",
"+\n",
- "+\t\t\tport\@0 {\n",
+ "+\t\t\tport at 0 {\n",
"+\t\t\t\treg = <0>;\n",
"+\t\t\t\tlabel = \"lan3\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@1 {\n",
+ "+\t\t\tport at 1 {\n",
"+\t\t\t\treg = <1>;\n",
"+\t\t\t\tlabel = \"lan4\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@2 {\n",
+ "+\t\t\tport at 2 {\n",
"+\t\t\t\treg = <2>;\n",
"+\t\t\t\tlabel = \"wan\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@3 {\n",
+ "+\t\t\tport at 3 {\n",
"+\t\t\t\treg = <3>;\n",
"+\t\t\t\tlabel = \"cpu\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@5 {\n",
+ "+\t\t\tport at 5 {\n",
"+\t\t\t\treg = <5>;\n",
"+\t\t\t\tlabel = \"lan1\";\n",
"+\t\t\t};\n",
"+\n",
- "+\t\t\tport\@7 {\n",
+ "+\t\t\tport at 7 {\n",
"+\t\t\t\treg = <7>;\n",
"+\t\t\t\tlabel = \"lan2\";\n",
"+\t\t\t};\n",
@@ -194,29 +182,29 @@
"+\n",
"+\tdevbus,keep-config;\n",
"+\n",
- "+\tflash\@0 {\n",
+ "+\tflash at 0 {\n",
"+\t\tcompatible = \"cfi-flash\";\n",
"+\t\treg = <0 0x800000>;\n",
"+\t\tbank-width = <1>;\n",
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\tpartition\@0 {\n",
+ "+\t\tpartition at 0 {\n",
"+\t\t\tlabel = \"kernel\";\n",
"+\t\t\treg = <0x0 0x100000>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@100000 {\n",
+ "+\t\tpartition at 100000 {\n",
"+\t\t\tlabel = \"rootfs\";\n",
"+\t\t\treg = <0x100000 0x660000>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@760000 {\n",
+ "+\t\tpartition at 760000 {\n",
"+\t\t\tlabel = \"uboot_env\";\n",
"+\t\t\treg = <0x760000 0x20000>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tpartition\@780000 {\n",
+ "+\t\tpartition at 780000 {\n",
"+\t\t\tlabel = \"uboot\";\n",
"+\t\t\treg = <0x780000 0x80000>;\n",
"+\t\t\tread-only;\n",
@@ -230,7 +218,7 @@
"+\n",
"+ð {\n",
"+\tstatus = \"okay\";\n",
- "+\tethernet-port\@0 {\n",
+ "+\tethernet-port at 0 {\n",
"+\t\tspeed = <1000>;\n",
"+\t\tduplex = <1>;\n",
"+\t};\n",
@@ -390,4 +378,4 @@
"2.8.1"
]
-de89e4dd4f75485eb04d18b7868ae9ae93a77080e3b0f142a633c76a71192746
+3586d87290bef2a5d77dd9e5c78f0901cd33f61d9ccd82229951392093a2eb5d
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.