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

2018-03-27 Thread Arnd Bergmann
On Tue, Mar 27, 2018 at 9:55 AM, Shawn Guo wrote: > On Tue, Mar 27, 2018 at 09:10:26AM +1100, Stephen Rothwell wrote: >> Hi Shawn, >> >> Today's linux-next merge of the imx-mxs tree got a conflict in: >> >> arch/arm/configs/mxs_defconfig >> >> between commit: >> >> e3e583e7a293 ("ARM: mxs_defc

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

2018-03-27 Thread Shawn Guo
On Tue, Mar 27, 2018 at 09:10:26AM +1100, Stephen Rothwell wrote: > Hi Shawn, > > Today's linux-next merge of the imx-mxs tree got a conflict in: > > arch/arm/configs/mxs_defconfig > > between commit: > > e3e583e7a293 ("ARM: mxs_defconfig: Re-sync defconfig") > > from the arm-soc tree and

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

2015-01-13 Thread Stephen Rothwell
Hi Arnd, On Tue, 13 Jan 2015 14:18:32 +0100 Arnd Bergmann wrote: > > There is an extraneous '\' character behind imx6sx-sdb.dtb now, which caused > build errors for me. We should soon be able to merge the other branches into > arm-soc to avoid the entire set of merge conflicts, until then please

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

2015-01-13 Thread Arnd Bergmann
On Tuesday 13 January 2015 11:16:36 Stephen Rothwell wrote: > - imx6q-tx6q-1110.dtb \ > - imx6sl-evk.dtb \ > + imx6q-tx6q-1110.dtb > +dtb-$(CONFIG_SOC_IMX6SL) += \ > + imx6sl-evk.dtb > +dtb-$(CONFIG_SOC_IMX6SX) += \ > + imx6sx-sabreauto.dtb \ > imx6sx-sdb.dtb

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

2014-02-19 Thread Shawn Guo
On Thu, Feb 20, 2014 at 11:42:42AM +1100, Stephen Rothwell wrote: > Hi Shawn, > > Today's linux-next merge of the imx-mxs tree got conflicts in > arch/arm/mach-imx/Makefile and arch/arm/mach-imx/common.h between commit > 28a9f3b078c5 ("ARM: imx6: build pm-imx6q.c independently of CONFIG_PM") > fro