diff for duplicates of <1479967709-6619-3-git-send-email-krzk@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 98ef132..e497759 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ Possible trivial conflict: @@@ -197,10 -188,10 +197,10 @@@ }; - gmac: ethernet@00230000 { + gmac: ethernet at 00230000 { - compatible = "snps,dwmac-3.70a"; + compatible = "snps,dwmac-3.70a", "snps,dwmac"; reg = <0x00230000 0x8000>; diff --git a/a/content_digest b/N1/content_digest index 297fd28..9499be0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,8 @@ "ref\01479967709-6619-1-git-send-email-krzk@kernel.org\0" - "From\0Krzysztof Kozlowski <krzk@kernel.org>\0" + "From\0krzk@kernel.org (Krzysztof Kozlowski)\0" "Subject\0[GIT PULL 2/3] ARM: dts: exynos: DT for v4.10, second round\0" "Date\0Thu, 24 Nov 2016 08:08:28 +0200\0" - "To\0Olof Johansson <olof@lixom.net>" - Arnd Bergmann <arnd@arndb.de> - Kevin Hilman <khilman@kernel.org> - " arm@kernel.org\0" - "Cc\0Krzysztof Kozlowski <krzk@kernel.org>" - Kukjin Kim <kgene@kernel.org> - linux-arm-kernel@lists.infradead.org - linux-samsung-soc@vger.kernel.org - linux-kernel@vger.kernel.org - " Javier Martinez Canillas <javier@osg.samsung.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -24,7 +15,7 @@ "@@@ -197,10 -188,10 +197,10 @@@\n" " };\n" " \n" - " gmac: ethernet@00230000 {\n" + " gmac: ethernet at 00230000 {\n" "- compatible = \"snps,dwmac-3.70a\";\n" "+ compatible = \"snps,dwmac-3.70a\", \"snps,dwmac\";\n" " reg = <0x00230000 0x8000>;\n" @@ -82,4 +73,4 @@ " arch/arm/boot/dts/exynos5440.dtsi | 2 +-\n" 8 files changed, 23 insertions(+), 8 deletions(-) -41aec5a3430134c224d48ee778f2983f7cd5614582fc6b80b5c0fee174fb850d +571ca45419cd1f5dc594a26b5e22001e7a742788de656a4268472c383322d4bd
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.