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 sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpGB2gUQ9Xuw.pgp
Description: PGP signature
