diff for duplicates of <1508291246.2746.41.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index e75f1c6..c2ee6a6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,16 +7,16 @@ On Mon, 2017-10-16 at 10:17 +0100, Mark Brown wrote: > > Today's linux-next merge of the thermal tree got a conflict in: > -> arch/arm/boot/dts/imx6ul.dtsi +> ? arch/arm/boot/dts/imx6ul.dtsi > > between commit: > -> efb9adb274754 ("ARM: dts: imx6ul: Remove leading zeroes from unit +> ???efb9adb274754 ("ARM: dts: imx6ul: Remove leading zeroes from unit > addresses") > > from the imx-mxs tree and commit: > -> 1dc31d4981dd9 ("ARM: dts: imx6ul: Add imx6ul-tempmon") +> ???1dc31d4981dd9 ("ARM: dts: imx6ul: Add imx6ul-tempmon") > > from the thermal tree. > @@ -24,10 +24,10 @@ On Mon, 2017-10-16 at 10:17 +0100, Mark Brown wrote: > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your > tree -> is submitted for merging. You may also want to consider cooperating +> is submitted for merging.??You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any > particularly -> complex conflicts. Usually DTS changes go through arm-soc to avoid +> complex conflicts.??Usually DTS changes go through arm-soc to avoid > issues like this. Shawn, @@ -45,31 +45,31 @@ rui > --- a/arch/arm/boot/dts/imx6ul.dtsi > +++ b/arch/arm/boot/dts/imx6ul.dtsi > @@@ -860,13 -869,23 +869,23 @@@ -> reg = <0x021b0000 0x4000>; -> }; -> -> - ocotp: ocotp-ctrl@021bc000 { -> + ocotp: ocotp-ctrl@21bc000 { -> + #address-cells = <1>; -> + #size-cells = <1>; -> compatible = "fsl,imx6ul-ocotp", +> ?? reg = <0x021b0000 0x4000>; +> ?? }; +> ?? +> ?- ocotp: ocotp-ctrl at 021bc000 { +> ?+ ocotp: ocotp-ctrl at 21bc000 { +> +? #address-cells = <1>; +> +? #size-cells = <1>; +> ?? compatible = "fsl,imx6ul-ocotp", > "syscon"; -> reg = <0x021bc000 0x4000>; -> clocks = <&clks IMX6UL_CLK_OCOTP>; -> + -> + tempmon_calib: calib@38 { -> + reg = <0x38 4>; -> + }; -> + -> + tempmon_temp_grade: temp-grade@20 { -> + reg = <0x20 4>; -> + }; -> }; -> -> - lcdif: lcdif@021c8000 { -> + lcdif: lcdif@21c8000 { -> compatible = "fsl,imx6ul-lcdif", +> ?? reg = <0x021bc000 0x4000>; +> ?? clocks = <&clks IMX6UL_CLK_OCOTP>; +> +? +> +? tempmon_calib: calib at 38 { +> +? reg = <0x38 4>; +> +? }; +> +? +> +? tempmon_temp_grade: temp-grade at 20 { +> +? reg = <0x20 4>; +> +? }; +> ?? }; +> ?? +> ?- lcdif: lcdif at 021c8000 { +> ?+ lcdif: lcdif at 21c8000 { +> ?? compatible = "fsl,imx6ul-lcdif", > "fsl,imx28-lcdif"; -> reg = <0x021c8000 0x4000>; -> interrupts = <GIC_SPI 5 +> ?? reg = <0x021c8000 0x4000>; +> ?? interrupts = <GIC_SPI 5 > IRQ_TYPE_LEVEL_HIGH>; diff --git a/a/content_digest b/N1/content_digest index 6a857dc..dc166be 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\020171016091728.gbtoakghi4ndyyt2@sirena.co.uk\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: linux-next: manual merge of the thermal tree with the imx-mxs tree\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0linux-next: manual merge of the thermal tree with the imx-mxs tree\0" "Date\0Wed, 18 Oct 2017 09:47:26 +0800\0" - "To\0Mark Brown <broonie@kernel.org>" - Leonard Crestez <leonard.crestez@nxp.com> - Shawn Guo <shawnguo@kernel.org> - " Marco Franchi <marco.franchi@nxp.com>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - Linux-Next Mailing List <linux-next@vger.kernel.org> - " Linux Kernel Mailing List <linux-kernel@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi, Mark,\n" @@ -20,16 +14,16 @@ "> \n" "> Today's linux-next merge of the thermal tree got a conflict in:\n" "> \n" - "> \302\240 arch/arm/boot/dts/imx6ul.dtsi\n" + "> ? arch/arm/boot/dts/imx6ul.dtsi\n" "> \n" "> between commit:\n" "> \n" - "> \302\240\302\240\302\240efb9adb274754 (\"ARM: dts: imx6ul: Remove leading zeroes from unit\n" + "> ???efb9adb274754 (\"ARM: dts: imx6ul: Remove leading zeroes from unit\n" "> addresses\")\n" "> \n" "> from the imx-mxs tree and commit:\n" "> \n" - "> \302\240\302\240\302\2401dc31d4981dd9 (\"ARM: dts: imx6ul: Add imx6ul-tempmon\")\n" + "> ???1dc31d4981dd9 (\"ARM: dts: imx6ul: Add imx6ul-tempmon\")\n" "> \n" "> from the thermal tree.\n" "> \n" @@ -37,10 +31,10 @@ "> is now fixed as far as linux-next is concerned, but any non trivial\n" "> conflicts should be mentioned to your upstream maintainer when your\n" "> tree\n" - "> is submitted for merging.\302\240\302\240You may also want to consider cooperating\n" + "> is submitted for merging.??You may also want to consider cooperating\n" "> with the maintainer of the conflicting tree to minimise any\n" "> particularly\n" - "> complex conflicts.\302\240\302\240Usually DTS changes go through arm-soc to avoid\n" + "> complex conflicts.??Usually DTS changes go through arm-soc to avoid\n" "> issues like this.\n" "\n" "Shawn,\n" @@ -58,33 +52,33 @@ "> --- a/arch/arm/boot/dts/imx6ul.dtsi\n" "> +++ b/arch/arm/boot/dts/imx6ul.dtsi\n" "> @@@ -860,13 -869,23 +869,23 @@@\n" - "> \302\240\302\240\t\t\t\treg = <0x021b0000 0x4000>;\n" - "> \302\240\302\240\t\t\t};\n" - "> \302\240\302\240\n" - "> \302\240-\t\t\tocotp: ocotp-ctrl@021bc000 {\n" - "> \302\240+\t\t\tocotp: ocotp-ctrl@21bc000 {\n" - "> +\302\240\t\t\t\t#address-cells = <1>;\n" - "> +\302\240\t\t\t\t#size-cells = <1>;\n" - "> \302\240\302\240\t\t\t\tcompatible = \"fsl,imx6ul-ocotp\",\n" + "> ??\t\t\t\treg = <0x021b0000 0x4000>;\n" + "> ??\t\t\t};\n" + "> ??\n" + "> ?-\t\t\tocotp: ocotp-ctrl at 021bc000 {\n" + "> ?+\t\t\tocotp: ocotp-ctrl at 21bc000 {\n" + "> +?\t\t\t\t#address-cells = <1>;\n" + "> +?\t\t\t\t#size-cells = <1>;\n" + "> ??\t\t\t\tcompatible = \"fsl,imx6ul-ocotp\",\n" "> \"syscon\";\n" - "> \302\240\302\240\t\t\t\treg = <0x021bc000 0x4000>;\n" - "> \302\240\302\240\t\t\t\tclocks = <&clks IMX6UL_CLK_OCOTP>;\n" - "> +\302\240\n" - "> +\302\240\t\t\t\ttempmon_calib: calib@38 {\n" - "> +\302\240\t\t\t\t\treg = <0x38 4>;\n" - "> +\302\240\t\t\t\t};\n" - "> +\302\240\n" - "> +\302\240\t\t\t\ttempmon_temp_grade: temp-grade@20 {\n" - "> +\302\240\t\t\t\t\treg = <0x20 4>;\n" - "> +\302\240\t\t\t\t};\n" - "> \302\240\302\240\t\t\t};\n" - "> \302\240\302\240\n" - "> \302\240-\t\t\tlcdif: lcdif@021c8000 {\n" - "> \302\240+\t\t\tlcdif: lcdif@21c8000 {\n" - "> \302\240\302\240\t\t\t\tcompatible = \"fsl,imx6ul-lcdif\",\n" + "> ??\t\t\t\treg = <0x021bc000 0x4000>;\n" + "> ??\t\t\t\tclocks = <&clks IMX6UL_CLK_OCOTP>;\n" + "> +?\n" + "> +?\t\t\t\ttempmon_calib: calib at 38 {\n" + "> +?\t\t\t\t\treg = <0x38 4>;\n" + "> +?\t\t\t\t};\n" + "> +?\n" + "> +?\t\t\t\ttempmon_temp_grade: temp-grade at 20 {\n" + "> +?\t\t\t\t\treg = <0x20 4>;\n" + "> +?\t\t\t\t};\n" + "> ??\t\t\t};\n" + "> ??\n" + "> ?-\t\t\tlcdif: lcdif at 021c8000 {\n" + "> ?+\t\t\tlcdif: lcdif at 21c8000 {\n" + "> ??\t\t\t\tcompatible = \"fsl,imx6ul-lcdif\",\n" "> \"fsl,imx28-lcdif\";\n" - "> \302\240\302\240\t\t\t\treg = <0x021c8000 0x4000>;\n" - "> \302\240\302\240\t\t\t\tinterrupts = <GIC_SPI 5\n" + "> ??\t\t\t\treg = <0x021c8000 0x4000>;\n" + "> ??\t\t\t\tinterrupts = <GIC_SPI 5\n" > IRQ_TYPE_LEVEL_HIGH>; -2bf7210a26d990f8f77dbbab1132b2a02799d47d26b775d808e82426ae188f9f +e4bd44f84cdcc429c6e8715ee6cd8e50df83d341519627d72bccfb87c280db45
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.