Hi Jesse, Today's linux-next merge of the pci tree got a conflict in arch/powerpc/platforms/iseries/pci.c between commit 8ee3e0d69623 ("powerpc: Remove the main legacy iSerie platform code") from the powerpc tree and commit 673c97562489 ("powerpc/PCI: replace pci_probe_only with pci_flags") from the pci tree.
The former removed the file, so I did that. -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpGhM7Mfi5jk.pgp
Description: PGP signature
_______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev