Re: linux-next: manual merge of the thermal tree with the imx-mxs tree

2017-10-17 Thread Shawn Guo
On Wed, Oct 18, 2017 at 09:47:26AM +0800, Zhang Rui wrote: > Shawn, > > https://patchwork.kernel.org/patch/9841191/ > https://patchwork.kernel.org/patch/9841193/ > Should I drop these two dts patches and leave them to you? Okay, let's do that to avoid the conflict. Shawn

Re: linux-next: manual merge of the thermal tree with the imx-mxs tree

2017-10-17 Thread Zhang Rui
Hi, Mark, thanks for the fix. On Mon, 2017-10-16 at 10:17 +0100, Mark Brown wrote: > Hi Zhang, > > Today's linux-next merge of the thermal tree got a conflict in: > >   arch/arm/boot/dts/imx6ul.dtsi > > between commit: > >    efb9adb274754 ("ARM: dts: imx6ul: Remove leading zeroes from unit >