diff for duplicates of <2158897.lfmL4b1c4V@wasted.cogentembedded.com>
diff --git a/a/1.txt b/N1/1.txt
index a7f6362..55309d4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,7 +13,8 @@ This patch is against 'renesas-devel-20151221-v4.4-rc6' tag of Simon Horman's
1 file changed, 81 insertions(+)
Index: renesas/arch/arm/boot/dts/r8a7791-porter.dts
-=================================--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts
+===================================================================
+--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts
+++ renesas/arch/arm/boot/dts/r8a7791-porter.dts
@@ -78,6 +78,29 @@
states = <3300000 1
diff --git a/a/content_digest b/N1/content_digest
index 43e1fbe..e9e8604 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,10 +8,22 @@
"Subject\0[PATCH] ARM: shmobile: porter: add DU DT support\0"
]
[
- "Date\0Thu, 24 Dec 2015 22:45:30 +0000\0"
+ "Date\0Fri, 25 Dec 2015 01:45:30 +0300\0"
]
[
- "To\0linux-arm-kernel\@lists.infradead.org\0"
+ "To\0horms\@verge.net.au",
+ " linux-sh\@vger.kernel.org",
+ " robh+dt\@kernel.org",
+ " pawel.moll\@arm.com",
+ " mark.rutland\@arm.com",
+ " ijc+devicetree\@hellion.org.uk",
+ " galak\@codeaurora.org",
+ " devicetree\@vger.kernel.org\0"
+]
+[
+ "Cc\0magnus.damm\@gmail.com",
+ " linux\@arm.linux.org.uk",
+ " linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -35,7 +47,8 @@
" 1 file changed, 81 insertions(+)\n",
"\n",
"Index: renesas/arch/arm/boot/dts/r8a7791-porter.dts\n",
- "=================================--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts\n",
+ "===================================================================\n",
+ "--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts\n",
"+++ renesas/arch/arm/boot/dts/r8a7791-porter.dts\n",
"\@\@ -78,6 +78,29 \@\@\n",
" \t\tstates = <3300000 1\n",
@@ -145,4 +158,4 @@
"+};"
]
-431206bfe6c73aa0aa9754745a6a12568c3ea48ca28ba6b0ca6c237f8297836b
+94c24b960d463279d82dc3e8d37db1fbfc2fb5380ef54bf4e72507264372a85e
diff --git a/a/1.txt b/N2/1.txt
index a7f6362..b032419 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -13,7 +13,8 @@ This patch is against 'renesas-devel-20151221-v4.4-rc6' tag of Simon Horman's
1 file changed, 81 insertions(+)
Index: renesas/arch/arm/boot/dts/r8a7791-porter.dts
-=================================--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts
+===================================================================
+--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts
+++ renesas/arch/arm/boot/dts/r8a7791-porter.dts
@@ -78,6 +78,29 @@
states = <3300000 1
@@ -62,7 +63,7 @@ Index: renesas/arch/arm/boot/dts/r8a7791-porter.dts
};
};
+
-+ hdmi@39 {
++ hdmi at 39 {
+ compatible = "adi,adv7511w";
+ reg = <0x39>;
+ interrupt-parent = <&gpio3>;
@@ -78,14 +79,14 @@ Index: renesas/arch/arm/boot/dts/r8a7791-porter.dts
+ #address-cells = <1>;
+ #size-cells = <0>;
+
-+ port@0 {
++ port at 0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&du_out_rgb>;
+ };
+ };
+
-+ port@1 {
++ port at 1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con>;
@@ -114,7 +115,7 @@ Index: renesas/arch/arm/boot/dts/r8a7791-porter.dts
+ "dclkin.0", "dclkin.1";
+
+ ports {
-+ port@1 {
++ port at 1 {
+ endpoint {
+ remote-endpoint = <&adv7511_in>;
+ };
diff --git a/a/content_digest b/N2/content_digest
index 43e1fbe..23094da 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,13 +2,13 @@
"ref\0001674850.BZpGW9kEud\@wasted.cogentembedded.com\0"
]
[
- "From\0Sergei Shtylyov <sergei.shtylyov\@cogentembedded.com>\0"
+ "From\0sergei.shtylyov\@cogentembedded.com (Sergei Shtylyov)\0"
]
[
"Subject\0[PATCH] ARM: shmobile: porter: add DU DT support\0"
]
[
- "Date\0Thu, 24 Dec 2015 22:45:30 +0000\0"
+ "Date\0Fri, 25 Dec 2015 01:45:30 +0300\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -35,7 +35,8 @@
" 1 file changed, 81 insertions(+)\n",
"\n",
"Index: renesas/arch/arm/boot/dts/r8a7791-porter.dts\n",
- "=================================--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts\n",
+ "===================================================================\n",
+ "--- renesas.orig/arch/arm/boot/dts/r8a7791-porter.dts\n",
"+++ renesas/arch/arm/boot/dts/r8a7791-porter.dts\n",
"\@\@ -78,6 +78,29 \@\@\n",
" \t\tstates = <3300000 1\n",
@@ -84,7 +85,7 @@
" \t\t};\n",
" \t};\n",
"+\n",
- "+\thdmi\@39 {\n",
+ "+\thdmi at 39 {\n",
"+\t\tcompatible = \"adi,adv7511w\";\n",
"+\t\treg = <0x39>;\n",
"+\t\tinterrupt-parent = <&gpio3>;\n",
@@ -100,14 +101,14 @@
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <0>;\n",
"+\n",
- "+\t\t\tport\@0 {\n",
+ "+\t\t\tport at 0 {\n",
"+\t\t\t\treg = <0>;\n",
"+\t\t\t\tadv7511_in: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&du_out_rgb>;\n",
"+\t\t\t\t};\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\tadv7511_out: endpoint {\n",
"+\t\t\t\t\tremote-endpoint = <&hdmi_con>;\n",
@@ -136,7 +137,7 @@
"+\t\t \"dclkin.0\", \"dclkin.1\";\n",
"+\n",
"+\tports {\n",
- "+\t\tport\@1 {\n",
+ "+\t\tport at 1 {\n",
"+\t\t\tendpoint {\n",
"+\t\t\t\tremote-endpoint = <&adv7511_in>;\n",
"+\t\t\t};\n",
@@ -145,4 +146,4 @@
"+};"
]
-431206bfe6c73aa0aa9754745a6a12568c3ea48ca28ba6b0ca6c237f8297836b
+b35f1389e108548b6cab47f7da756e8e45f78effe71dcfc231a3e52c210b895b
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.