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, Stephen Rothwell s...@canb.auug.org.au
pgphoNjUFKjK0.pgp
Description: PGP signature
_______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
