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

2013-06-26 Thread Russell King
On Wed, Jun 26, 2013 at 11:04:11AM +1000, Stephen Rothwell wrote: Hi Lorenzo, Today's linux-next merge of the arm-mpidr tree got a conflict in arch/arm/kernel/suspend.c between commit 7604537bbb57 (ARM: kernel: implement stack pointer save array through MPIDR hashing) from the arm tree and

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

2013-06-26 Thread Lorenzo Pieralisi
Hi Stephen, On Wed, Jun 26, 2013 at 02:04:11AM +0100, Stephen Rothwell wrote: Hi Lorenzo, Today's linux-next merge of the arm-mpidr tree got a conflict in arch/arm/kernel/suspend.c between commit 7604537bbb57 (ARM: kernel: implement stack pointer save array through MPIDR hashing) from the

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

2013-06-26 Thread Stephen Rothwell
Hi Lorenzo, On Wed, 26 Jun 2013 09:57:20 +0100 Lorenzo Pieralisi lorenzo.pieral...@arm.com wrote: No, arm-mpidr can be dropped from -next now that those patches, as you correctly mentioned, are queued through the arm tree. Thanks, done. -- Cheers, Stephen Rothwell

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

2013-06-25 Thread Stephen Rothwell
Hi Lorenzo, Today's linux-next merge of the arm-mpidr tree got a conflict in arch/arm/kernel/suspend.c between commit 7604537bbb57 (ARM: kernel: implement stack pointer save array through MPIDR hashing) from the arm tree and commit 3fed6a1e3bf0 (ARM: kernel: implement stack pointer save array

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

2013-06-19 Thread Russell King
On Wed, Jun 19, 2013 at 10:44:09AM +1000, Stephen Rothwell wrote: Hi Lorenzo, Today's linux-next merge of the arm-mpidr tree got a conflict in arch/arm/kernel/suspend.c between commit aa1aadc3305c (ARM: suspend: fix CPU suspend code for !CONFIG_MMU configurations) from the arm tree and

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

2013-06-19 Thread Jonathan Austin
On 19/06/13 09:26, Russell King wrote: On Wed, Jun 19, 2013 at 10:44:09AM +1000, Stephen Rothwell wrote: Hi Lorenzo, Today's linux-next merge of the arm-mpidr tree got a conflict in arch/arm/kernel/suspend.c between commit aa1aadc3305c (ARM: suspend: fix CPU suspend code for !CONFIG_MMU

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

2013-06-18 Thread Stephen Rothwell
Hi Lorenzo, Today's linux-next merge of the arm-mpidr tree got a conflict in arch/arm/kernel/suspend.c between commit aa1aadc3305c (ARM: suspend: fix CPU suspend code for !CONFIG_MMU configurations) from the arm tree and commit 3fed6a1e3bf0 (ARM: kernel: implement stack pointer save array through