diff for duplicates of <2919897.nbhB5Cifed@phil>
diff --git a/a/content_digest b/N1/content_digest
index c663b87..ecc2451 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -43,10 +43,7 @@
" robherring2\@gmail.com",
" dri-devel\@lists.freedesktop.org",
" devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-samsung-soc\@vger.kernel.org",
- " linux-rockchip\@lists.infradead.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ " linux-kernel\0"
]
[
"\0000:1\0"
@@ -185,4 +182,4 @@
"Heiko"
]
-df3c59269f679a0acbdb05ca249acf81844048de563cf4a127939762a18d1f8e
+b0aba9c9ceb3a3fedc04c3fc4eca5ffb4b3dcc42ba7bfc838fb5287b85bfd593
diff --git a/a/1.txt b/N2/1.txt
index 9e502f5..21e3a9a 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -74,7 +74,7 @@ Am Dienstag, 1. September 2015, 14:01:28 schrieb Yakir Yang:
> +---------------------------------------------------------------------------
> ---- +
> +Example:
-> + dp-controller: dp@ff970000 {
+> + dp-controller: dp at ff970000 {
> + compatible = "rockchip,rk3288-dp";
> + reg = <0xff970000 0x4000>;
> + interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -93,17 +93,17 @@ Am Dienstag, 1. September 2015, 14:01:28 schrieb Yakir Yang:
> + edp_in: port {
> + #address-cells = <1>;
> + #size-cells = <0>;
-> + edp_in_vopb: endpoint@0 {
+> + edp_in_vopb: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&vopb_out_edp>;
> + };
-> + edp_in_vopl: endpoint@1 {
+> + edp_in_vopl: endpoint at 1 {
> + reg = <1>;
> + remote-endpoint = <&vopl_out_edp>;
> + };
> + };
> +
-> + edp_out: port@1 {
+> + edp_out: port at 1 {
> + reg = <1>;
> + #address-cells = <1>;
> + #size-cells = <0>;
diff --git a/a/content_digest b/N2/content_digest
index c663b87..6ccba73 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,48 +5,16 @@
"ref\0001441087288-25404-1-git-send-email-ykk\@rock-chips.com\0"
]
[
- "From\0Heiko Stuebner <heiko\@sntech.de>\0"
+ "From\0heiko\@sntech.de (Heiko Stuebner)\0"
]
[
- "Subject\0Re: [PATCH v4 08/16] drm: rockchip/dp: add rockchip platform dp driver\0"
+ "Subject\0[PATCH v4 08/16] drm: rockchip/dp: add rockchip platform dp driver\0"
]
[
"Date\0Tue, 01 Sep 2015 16:24:04 +0200\0"
]
[
- "To\0Yakir Yang <ykk\@rock-chips.com>\0"
-]
-[
- "Cc\0Thierry Reding <treding\@nvidia.com>",
- " Jingoo Han <jingoohan1\@gmail.com>",
- " Inki Dae <inki.dae\@samsung.com>",
- " joe\@perches.com",
- " Kukjin Kim <kgene\@kernel.org>",
- " Krzysztof Kozlowski <k.kozlowski\@samsung.com>",
- " Mark Yao <mark.yao\@rock-chips.com>",
- " Russell King <rmk+kernel\@arm.linux.org.uk>",
- " djkurtz\@chromium.com",
- " dianders\@chromium.com",
- " seanpaul\@chromium.com",
- " ajaynumb\@gmail.com",
- " Andrzej Hajda <a.hajda\@samsung.com>",
- " Kyungmin Park <kyungmin.park\@samsung.com>",
- " David Airlie <airlied\@linux.ie>",
- " Gustavo Padovan <gustavo.padovan\@collabora.co.uk>",
- " Andy Yan <andy.yan\@rock-chips.com>",
- " Kumar Gala <galak\@codeaurora.org>",
- " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Pawel Moll <pawel.moll\@arm.com>",
- " Kishon Vijay Abraham I <kishon\@ti.com>",
- " architt\@codeaurora.org",
- " robherring2\@gmail.com",
- " dri-devel\@lists.freedesktop.org",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-samsung-soc\@vger.kernel.org",
- " linux-rockchip\@lists.infradead.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -131,7 +99,7 @@
"> +---------------------------------------------------------------------------\n",
"> ---- +\n",
"> +Example:\n",
- "> +\tdp-controller: dp\@ff970000 {\n",
+ "> +\tdp-controller: dp at ff970000 {\n",
"> +\t\tcompatible = \"rockchip,rk3288-dp\";\n",
"> +\t\treg = <0xff970000 0x4000>;\n",
"> +\t\tinterrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -150,17 +118,17 @@
"> +\t\t\tedp_in: port {\n",
"> +\t\t\t\t#address-cells = <1>;\n",
"> +\t\t\t\t#size-cells = <0>;\n",
- "> +\t\t\t\tedp_in_vopb: endpoint\@0 {\n",
+ "> +\t\t\t\tedp_in_vopb: endpoint at 0 {\n",
"> +\t\t\t\t\treg = <0>;\n",
"> +\t\t\t\t\tremote-endpoint = <&vopb_out_edp>;\n",
"> +\t\t\t\t};\n",
- "> +\t\t\t\tedp_in_vopl: endpoint\@1 {\n",
+ "> +\t\t\t\tedp_in_vopl: endpoint at 1 {\n",
"> +\t\t\t\t\treg = <1>;\n",
"> +\t\t\t\t\tremote-endpoint = <&vopl_out_edp>;\n",
"> +\t\t\t\t};\n",
"> +\t\t\t};\n",
"> +\n",
- "> +\t\t\tedp_out: port\@1 {\n",
+ "> +\t\t\tedp_out: port at 1 {\n",
"> +\t\t\t\treg = <1>;\n",
"> +\t\t\t\t#address-cells = <1>;\n",
"> +\t\t\t\t#size-cells = <0>;\n",
@@ -185,4 +153,4 @@
"Heiko"
]
-df3c59269f679a0acbdb05ca249acf81844048de563cf4a127939762a18d1f8e
+f3259fc708e11de5eb2d2fc107650c118f35c4933db96a6e66143b8257a09bff
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.