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 revmap-specific initializers") from the irqdomain tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/powerpc/sysdev/mpic.c index 16eb743,c83a512..0000000 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@@ -1355,9 -1345,9 +1355,9 @@@ struct mpic * __init mpic_alloc(struct mpic->isu_shift = 1 + __ilog2(mpic->isu_size - 1); mpic->isu_mask = (1 << mpic->isu_shift) - 1; - mpic->irqhost = irq_alloc_host(mpic->node, IRQ_HOST_MAP_LINEAR, + mpic->irqhost = irq_domain_add_linear(mpic->node, - isu_size ? isu_size : mpic->num_sources, - &mpic_host_ops, mpic); + last_irq + 1, &mpic_host_ops, - intvec_top + 1); ++ mpic); /* * FIXME: The code leaks the MPIC object and mappings here; this
Attachment:
pgpaA5AnglglI.pgp
Description: PGP signature