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

2014-01-28 Thread Shawn Guo
On Wed, Jan 29, 2014 at 01:25:13PM +1100, Stephen Rothwell wrote: > Hi Shawn, > > On Wed, 29 Jan 2014 09:18:06 +0800 Shawn Guo wrote: > > > > I will rebase my branch on v3.14-rc1 once it's out. > > Um, does that mean that all that stuff is *not* destined for v3.14? ... Yes, Stephen. That's the

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

2014-01-28 Thread Stephen Rothwell
Hi Shawn, On Wed, 29 Jan 2014 09:18:06 +0800 Shawn Guo wrote: > > I will rebase my branch on v3.14-rc1 once it's out. Um, does that mean that all that stuff is *not* destined for v3.14? ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpngr0ewErs2.pgp Description: PG

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

2014-01-28 Thread Shawn Guo
On Wed, Jan 29, 2014 at 01:13:10AM +, Russell King - ARM Linux wrote: > On Wed, Jan 29, 2014 at 11:35:14AM +1100, Stephen Rothwell wrote: > > Hi Shawn, > > > > Today's linux-next merge of the imx-mxs tree got a conflict in > > arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:

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

2014-01-28 Thread Russell King - ARM Linux
On Wed, Jan 29, 2014 at 11:35:14AM +1100, Stephen Rothwell wrote: > Hi Shawn, > > Today's linux-next merge of the imx-mxs tree got a conflict in > arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx: > initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx: > initial So

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

2014-01-28 Thread Stephen Rothwell
Hi Shawn, Today's linux-next merge of the imx-mxs tree got a conflict in arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx: initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx: initial SolidRun Cubox-i support") from the arm tree and various commits from the imx-mx

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

2014-01-20 Thread Stephen Rothwell
Hi Shawn, Today's linux-next merge of the imx-mxs tree got conflicts in arch/arm/boot/dts/Makefile, arch/arm/boot/dts/imx6dl-hummingboard.dts, arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi and arch/arm/boot/dts/imx6qdl-microsom.dtsi between commits 728d5599f5d8 ("ARM: imx: initial SolidRun Hummin

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

2013-07-22 Thread Stephen Rothwell
Hi Shawn, Today's linux-next merge of the imx-mxs tree got a conflict in arch/arm/Kconfig.debug between commit 5e33abe38413 ("ARM: debug: move PL01X debug include into arch/arm/include/debug/") from the arm tree and commit d1814df976f2 ("ARM: imx: add low-level debug for vybrid") from the imx-mxs