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

Stephen Rothwell sfr at
Fri Mar 9 12:32:16 EST 2012

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.

Stephen Rothwell                    sfr at
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <>

More information about the Linuxppc-dev mailing list