diff for duplicates of <1defc5c1925e819b28f2b3802aadc9a8e7be224a.1491405475.git-series.gregory.clement@free-electrons.com>
diff --git a/a/1.txt b/N1/1.txt
index c96a41d..f5bbe8d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ Initially the node was named gpio1 using the same name that for the
register range in the datasheet. However renaming it pinctr_nb (nb for
North Bridge) makes more sens.
-Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 42 +++++++++++++++++++--
1 file changed, 39 insertions(+), 3 deletions(-)
@@ -71,8 +71,4 @@ index b48d668a6ab6..c02b13479458 100644
compatible = "marvell,armada-3700-neta";
reg = <0x30000 0x4000>;
--
-git-series 0.9.1
---
-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
\ No newline at end of file
+git-series 0.9.1
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 9637fb9..1616623 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,7 @@
"ref\0cover.65d0e6796fecf1fe6c5d07b981160b54dc9b4acd.1491405475.git-series.gregory.clement\@free-electrons.com\0"
]
[
- "ref\0cover.65d0e6796fecf1fe6c5d07b981160b54dc9b4acd.1491405475.git-series.gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org\0"
-]
-[
- "From\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\0"
+ "From\0Gregory CLEMENT <gregory.clement\@free-electrons.com>\0"
]
[
"Subject\0[PATCH v4 6/7] ARM64: dts: marvell: Add pinctrl nodes for Armada 3700\0"
@@ -14,25 +11,25 @@
"Date\0Wed, 5 Apr 2017 17:18:07 +0200\0"
]
[
- "To\0Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
- " linux-gpio-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
+ "To\0Linus Walleij <linus.walleij\@linaro.org>",
+ " linux-gpio\@vger.kernel.org\0"
]
[
- "Cc\0Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA\@public.gmane.org>",
- " Andrew Lunn <andrew-g2DYL2Zd6BY\@public.gmane.org>",
- " Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
- " Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>",
- " Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>",
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
- " Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
- " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " Nadav Haklai <nadavh-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>",
- " Victor Gu <xigu-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>",
- " Marcin Wojtas <mw-nYOzD4b6Jr9Wk0Htik3J/w\@public.gmane.org>",
- " Wilson Ding <dingwei-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>",
- " Hua Jing <jinghua-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>",
- " Neta Zur Hershkovits <neta-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>\0"
+ "Cc\0Jason Cooper <jason\@lakedaemon.net>",
+ " Andrew Lunn <andrew\@lunn.ch>",
+ " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
+ " Gregory CLEMENT <gregory.clement\@free-electrons.com>",
+ " Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>",
+ " linux-arm-kernel\@lists.infradead.org",
+ " Rob Herring <robh+dt\@kernel.org>",
+ " devicetree\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
+ " Nadav Haklai <nadavh\@marvell.com>",
+ " Victor Gu <xigu\@marvell.com>",
+ " Marcin Wojtas <mw\@semihalf.com>",
+ " Wilson Ding <dingwei\@marvell.com>",
+ " Hua Jing <jinghua\@marvell.com>",
+ " Neta Zur Hershkovits <neta\@marvell.com>\0"
]
[
"\0000:1\0"
@@ -47,7 +44,7 @@
"register range in the datasheet. However renaming it pinctr_nb (nb for\n",
"North Bridge) makes more sens.\n",
"\n",
- "Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\n",
+ "Signed-off-by: Gregory CLEMENT <gregory.clement\@free-electrons.com>\n",
"---\n",
" arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 42 +++++++++++++++++++--\n",
" 1 file changed, 39 insertions(+), 3 deletions(-)\n",
@@ -114,11 +111,7 @@
" \t\t\t\t compatible = \"marvell,armada-3700-neta\";\n",
" \t\t\t\t reg = <0x30000 0x4000>;\n",
"-- \n",
- "git-series 0.9.1\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"
+ "git-series 0.9.1"
]
-7b63572063df65b91907c649b2afd61de2afe381d33cb9b9c74348434d40987c
+2b88bc37ffe5b74a082133c7f39e1230db4094f7d7e107a7e0bf2ea9bda21808
diff --git a/a/1.txt b/N2/1.txt
index c96a41d..f8a3ba2 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -4,7 +4,7 @@ Initially the node was named gpio1 using the same name that for the
register range in the datasheet. However renaming it pinctr_nb (nb for
North Bridge) makes more sens.
-Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 42 +++++++++++++++++++--
1 file changed, 39 insertions(+), 3 deletions(-)
@@ -17,9 +17,9 @@ index b48d668a6ab6..c02b13479458 100644
#clock-cells = <1>;
};
-- gpio1: gpio@13800 {
+- gpio1: gpio at 13800 {
- compatible = "marvell,mvebu-gpio-3700",
-+ pinctrl_nb: pinctrl-nb@13800 {
++ pinctrl_nb: pinctrl-nb at 13800 {
+ compatible = "marvell,armada3710-nb-pinctrl",
"syscon", "simple-mfd";
- reg = <0x13800 0x500>;
@@ -50,7 +50,7 @@ index b48d668a6ab6..c02b13479458 100644
};
};
-+ pinctrl_sb: pinctrl-sb@18800 {
++ pinctrl_sb: pinctrl-sb at 18800 {
+ compatible = "marvell,armada3710-sb-pinctrl",
+ "syscon", "simple-mfd";
+ reg = <0x18800 0x100>, <0x18C00 0x20>;
@@ -67,12 +67,8 @@ index b48d668a6ab6..c02b13479458 100644
+ };
+ };
+
- eth0: ethernet@30000 {
+ eth0: ethernet at 30000 {
compatible = "marvell,armada-3700-neta";
reg = <0x30000 0x4000>;
--
-git-series 0.9.1
---
-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
\ No newline at end of file
+git-series 0.9.1
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 9637fb9..ab291f0 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,10 +2,7 @@
"ref\0cover.65d0e6796fecf1fe6c5d07b981160b54dc9b4acd.1491405475.git-series.gregory.clement\@free-electrons.com\0"
]
[
- "ref\0cover.65d0e6796fecf1fe6c5d07b981160b54dc9b4acd.1491405475.git-series.gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org\0"
-]
-[
- "From\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\0"
+ "From\0gregory.clement\@free-electrons.com (Gregory CLEMENT)\0"
]
[
"Subject\0[PATCH v4 6/7] ARM64: dts: marvell: Add pinctrl nodes for Armada 3700\0"
@@ -14,25 +11,7 @@
"Date\0Wed, 5 Apr 2017 17:18:07 +0200\0"
]
[
- "To\0Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
- " linux-gpio-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\0"
-]
-[
- "Cc\0Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA\@public.gmane.org>",
- " Andrew Lunn <andrew-g2DYL2Zd6BY\@public.gmane.org>",
- " Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
- " Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>",
- " Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>",
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
- " Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
- " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
- " Nadav Haklai <nadavh-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>",
- " Victor Gu <xigu-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>",
- " Marcin Wojtas <mw-nYOzD4b6Jr9Wk0Htik3J/w\@public.gmane.org>",
- " Wilson Ding <dingwei-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>",
- " Hua Jing <jinghua-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>",
- " Neta Zur Hershkovits <neta-eYqpPyKDWXRBDgjK7y7TUQ\@public.gmane.org>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -47,7 +26,7 @@
"register range in the datasheet. However renaming it pinctr_nb (nb for\n",
"North Bridge) makes more sens.\n",
"\n",
- "Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8\@public.gmane.org>\n",
+ "Signed-off-by: Gregory CLEMENT <gregory.clement\@free-electrons.com>\n",
"---\n",
" arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 42 +++++++++++++++++++--\n",
" 1 file changed, 39 insertions(+), 3 deletions(-)\n",
@@ -60,9 +39,9 @@
" \t\t\t\t#clock-cells = <1>;\n",
" \t\t\t};\n",
" \n",
- "-\t\t\tgpio1: gpio\@13800 {\n",
+ "-\t\t\tgpio1: gpio at 13800 {\n",
"-\t\t\t\tcompatible = \"marvell,mvebu-gpio-3700\",\n",
- "+\t\t\tpinctrl_nb: pinctrl-nb\@13800 {\n",
+ "+\t\t\tpinctrl_nb: pinctrl-nb at 13800 {\n",
"+\t\t\t\tcompatible = \"marvell,armada3710-nb-pinctrl\",\n",
" \t\t\t\t\"syscon\", \"simple-mfd\";\n",
"-\t\t\t\treg = <0x13800 0x500>;\n",
@@ -93,7 +72,7 @@
" \t\t\t\t};\n",
" \t\t\t};\n",
" \n",
- "+\t\t\tpinctrl_sb: pinctrl-sb\@18800 {\n",
+ "+\t\t\tpinctrl_sb: pinctrl-sb at 18800 {\n",
"+\t\t\t\tcompatible = \"marvell,armada3710-sb-pinctrl\",\n",
"+\t\t\t\t\"syscon\", \"simple-mfd\";\n",
"+\t\t\t\treg = <0x18800 0x100>, <0x18C00 0x20>;\n",
@@ -110,15 +89,11 @@
"+\t\t\t\t};\n",
"+\t\t\t};\n",
"+\n",
- " \t\t\teth0: ethernet\@30000 {\n",
+ " \t\t\teth0: ethernet at 30000 {\n",
" \t\t\t\t compatible = \"marvell,armada-3700-neta\";\n",
" \t\t\t\t reg = <0x30000 0x4000>;\n",
"-- \n",
- "git-series 0.9.1\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"
+ "git-series 0.9.1"
]
-7b63572063df65b91907c649b2afd61de2afe381d33cb9b9c74348434d40987c
+9e2984b51255549555c00517fdfb717a3b8f959071256c20ccf002b84b1043b8
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.