linux-next: manual merge of the mvebu tree with the arm tree

2014-07-16 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/headsmp-a9.S between commit e77a0969a99e ("ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree and commit 435b4642e49f ("ARM: mvebu: use the common function for Armada 375 SMP workaroun

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

2014-07-07 Thread Russell King - ARM Linux
On Mon, Jul 07, 2014 at 11:28:53AM +1000, Stephen Rothwell wrote: > diff --cc arch/arm/mach-mvebu/headsmp-a9.S > index 7c91ddb6f1f7,da5bb292b91c.. > --- a/arch/arm/mach-mvebu/headsmp-a9.S > +++ b/arch/arm/mach-mvebu/headsmp-a9.S > @@@ -14,8 -14,9 +14,10 @@@ > > #include > #inclu

linux-next: manual merge of the mvebu tree with the arm tree

2014-07-06 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/headsmp-a9.S between commit 8a3a9dd50dd9 ("ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree and commit 0e2be4c1121a ("ARM: mvebu: fix SMP boot for Armada 38x and Armada 375 Z1 in big

linux-next: manual merge of the mvebu tree with the arm tree

2014-04-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/board-v7.c between commit b21770945fa2 ("ARM: l2c: remove unnecessary UL-suffix to mask values") from the arm tree and commit 2865b82e9e19 ("ARM: mvebu: remove unnecessary ifdef around l2x0_of_init") from the