]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'next-sriov' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/power...
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Apr 2015 23:29:23 +0000 (09:29 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 13 Apr 2015 23:29:23 +0000 (09:29 +1000)
commitad30cb9946515f72af5c3e89ad9de18870c1a1e7
treeb4c9b385e18ae8128da1522055a17b453f2309fc
parentb0a478ede669949682b9c698f6146c0065543b91
parentd4ed11aa4881246e1e36e0189f30f053f140370c
Merge branch 'next-sriov' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next

Merge Richard's work to support SR-IOV on PowerNV. All generic PCI
patches acked by Bjorn.

Some minor conflicts with Daniel's pci_controller_ops work.

Conflicts:
arch/powerpc/include/asm/machdep.h
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/include/asm/iommu.h
arch/powerpc/include/asm/machdep.h
arch/powerpc/include/asm/pci-bridge.h
arch/powerpc/kernel/pci-common.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.c