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

2015-01-20 Thread Tony Lindgren
* Olof Johansson [150120 10:27]: > On Tue, Jan 20, 2015 at 9:10 AM, Tony Lindgren wrote: > > * Stephen Rothwell [150119 16:12]: > >> Hi Tony, > >> > >> Today's linux-next merge of the omap tree got a conflict in > >> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only > >> bu

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

2015-01-20 Thread Olof Johansson
On Tue, Jan 20, 2015 at 9:10 AM, Tony Lindgren wrote: > * Stephen Rothwell [150119 16:12]: >> Hi Tony, >> >> Today's linux-next merge of the omap tree got a conflict in >> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only >> build dtb if associated Arch and/or SoC is enabled

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

2015-01-20 Thread Tony Lindgren
* Stephen Rothwell [150119 16:12]: > Hi Tony, > > Today's linux-next merge of the omap tree got a conflict in > arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only > build dtb if associated Arch and/or SoC is enabled") from the arm-soc > tree and commit ac7452cee743 ("ARM: dts

linux-next: manual merge of the omap tree with the arm-soc tree

2015-01-19 Thread Stephen Rothwell
Hi Tony, Today's linux-next merge of the omap tree got a conflict in arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only build dtb if associated Arch and/or SoC is enabled") from the arm-soc tree and commit ac7452cee743 ("ARM: dts: Add minimal support for dm8168-evm") from the