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

2013-04-30 Thread Stefano Stabellini
On Tue, 30 Apr 2013, Stephen Rothwell wrote: > Hi Stefano, > > On Mon, 29 Apr 2013 10:50:22 +0100 Stefano Stabellini > wrote: > > > > On Mon, 29 Apr 2013, Catalin Marinas wrote: > > > > > > On Mon, Apr 29, 2013 at 08:54:26AM +0100, Stephen Rothwell wrote: > > > > Today's linux-next merge of the

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

2013-04-29 Thread Stephen Rothwell
Hi Stefano, On Mon, 29 Apr 2013 10:50:22 +0100 Stefano Stabellini wrote: > > On Mon, 29 Apr 2013, Catalin Marinas wrote: > > > > On Mon, Apr 29, 2013 at 08:54:26AM +0100, Stephen Rothwell wrote: > > > Today's linux-next merge of the arm-soc tree got a conflict in > > > arch/arm/mach-virt/platsm

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

2013-04-29 Thread Stefano Stabellini
On Mon, 29 Apr 2013, Catalin Marinas wrote: > Stephen, > > On Mon, Apr 29, 2013 at 08:54:26AM +0100, Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/mach-virt/platsmp.c between commit fe4bff02886b ("arm: introduce > > psci_smp_ops") from the

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

2013-04-29 Thread Catalin Marinas
Stephen, On Mon, Apr 29, 2013 at 08:54:26AM +0100, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-virt/platsmp.c between commit fe4bff02886b ("arm: introduce > psci_smp_ops") from the xen-arm tree and commit c0114709ed85 ("irqchip: > gic: P

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

2013-04-29 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-virt/platsmp.c between commit fe4bff02886b ("arm: introduce psci_smp_ops") from the xen-arm tree and commit c0114709ed85 ("irqchip: gic: Perform the gic_secondary_init() call via CPU notifier") from the arm-soc tr