diff for duplicates of <20180309032347.GG3217@dragon> diff --git a/a/1.txt b/N1/1.txt index b9c54dd..68c3a8b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -109,7 +109,7 @@ clock-xxx for node name. <snip> -> + usdhc1: usdhc at 30b40000 { +> + usdhc1: usdhc@30b40000 { s/usdhc/mmc for node name. @@ -127,7 +127,7 @@ s/usdhc/mmc for node name. > + status = "disabled"; > + }; > + -> + usdhc2: usdhc at 30b50000 { +> + usdhc2: usdhc@30b50000 { > + compatible = "fsl,imx8mq-usdhc", > + "fsl,imx7d-usdhc"; > + reg = <0x30b50000 0x10000>; diff --git a/a/content_digest b/N1/content_digest index b6b3c34..cf30ab1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,21 @@ "ref\020180201183126.32384-1-l.stach@pengutronix.de\0" "ref\020180201183126.32384-2-l.stach@pengutronix.de\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH v2 2/4] arm64: add basic DTS for i.MX8MQ\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH v2 2/4] arm64: add basic DTS for i.MX8MQ\0" "Date\0Fri, 9 Mar 2018 11:23:48 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Lucas Stach <l.stach@pengutronix.de>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Baruch Siach <baruch@tkos.co.il> + Catalin Marinas <catalin.marinas@arm.com> + Will Deacon <will.deacon@arm.com> + patchwork-lst@pengutronix.de + Rob Herring <robh+dt@kernel.org> + NXP Linux Team <linux-imx@nxp.com> + kernel@pengutronix.de + Fabio Estevam <fabio.estevam@nxp.com> + A . s . Dong <aisheng.dong@nxp.com> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, Feb 01, 2018 at 07:31:24PM +0100, Lucas Stach wrote:\n" @@ -117,7 +129,7 @@ "\n" "<snip>\n" "\n" - "> +\t\t\tusdhc1: usdhc at 30b40000 {\n" + "> +\t\t\tusdhc1: usdhc@30b40000 {\n" "\n" "s/usdhc/mmc for node name.\n" "\n" @@ -135,7 +147,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusdhc2: usdhc at 30b50000 {\n" + "> +\t\t\tusdhc2: usdhc@30b50000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx8mq-usdhc\",\n" "> +\t\t\t\t \"fsl,imx7d-usdhc\";\n" "> +\t\t\t\treg = <0x30b50000 0x10000>;\n" @@ -152,4 +164,4 @@ "\n" Shawn -848defed489ae69042f18f163c81edddac893272e704d466775cbc7e0880bd5c +cd47cd1946223e103319a192ad2ef4baf64db5eb17f05a02fe765584cd8ebf33
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.