Hi Jesse,

After merging the pci tree, today's linux-next build (powerpc
pseries_defconfig) failed like this:

drivers/pci/pci.c:2605: error: redefinition of 'pcibios_set_master'
arch/powerpc/include/asm/pci.h:49: note: previous definition of 'pcibios_set_master' was here

Presumably caused by commit 481da3e3d53e ("PCI: Pull PCI 'latency timer'
setup up into the core").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/