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

2017-10-30 Thread Mark Brown
Hi Santosh, Today's linux-next merge of the keystone tree got a conflict in: arch/arm/boot/dts/keystone-k2g.dtsi between commit: 8dccafaa281aa1d24 ("arm: dts: fix unit-address leading 0s") from the arm-soc tree and various commits from the keystone tree. I fixed it up (see below) and can

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

2014-03-25 Thread Santosh Shilimkar
On Monday 24 March 2014 09:23 PM, Balbi, Felipe wrote: > On Mon, Mar 24, 2014 at 08:00:03PM -0400, Santosh Shilimkar wrote: >> On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote: >>> Hi Santosh, >>> >>> Today's linux-next merge of the keystone tree got a conflict in >>> arch/arm/boot/dts/Make

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

2014-03-24 Thread Felipe Balbi
On Mon, Mar 24, 2014 at 08:00:03PM -0400, Santosh Shilimkar wrote: > On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote: > > Hi Santosh, > > > > Today's linux-next merge of the keystone tree got a conflict in > > arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move > > k

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

2014-03-24 Thread Santosh Shilimkar
On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote: > Hi Santosh, > > Today's linux-next merge of the keystone tree got a conflict in > arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move > kirkwood DT boards into mach-mvebu") from the arm-soc tree and commit > 400550ae

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

2014-03-24 Thread Stephen Rothwell
Hi Santosh, Today's linux-next merge of the keystone tree got a conflict in arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move kirkwood DT boards into mach-mvebu") from the arm-soc tree and commit 400550ae7e77 ("ARM: dts: Build all keystone dt blobs") from the keystone tree.