linux-next: manual merge of the irqdomain tree with the powerpc tree

Hi Grant, Today's linux-next merge of the irqdomain tree got a conflict in arch/powerpc/platforms/iseries/irq.c between commit 8ee3e0d69623 (powerpc: Remove the main legacy iSerie platform code) from the tree and three commits from the irqdomain tree. I just removed the file. -- Cheers,

linux-next: manual merge of the irqdomain tree with the powerpc tree

Hi Grant, Today's linux-next merge of the irqdomain tree got a conflict in arch/powerpc/sysdev/mpic.c between commit fe83364f0bf1 (powerpc/mpic: Fix allocation of reverse-map for multi-ISU mpics) from the powerpc tree and commit a8db8cf0d894 (irq_domain: Replace irq_alloc_host() with

Re: linux-next: manual merge of the irqdomain tree with the powerpc tree

[Just adding the PPC guys] On Fri, 24 Feb 2012 16:25:04 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: Hi Grant, Today's linux-next merge of the irqdomain tree got a conflict in arch/powerpc/sysdev/mpic.c between commits 3a7a7176e840 (powerpc/mpic: Fix use of flags variable in

Re: linux-next: manual merge of the irqdomain tree with the powerpc tree

On Thu, Feb 23, 2012 at 10:30 PM, Stephen Rothwell s...@canb.auug.org.au wrote: [Just adding the PPC guys] On Fri, 24 Feb 2012 16:25:04 +1100 Stephen Rothwell s...@canb.auug.org.au wrote: Hi Grant, Today's linux-next merge of the irqdomain tree got a conflict in