Michael Ellerman ce57c6610c Merge branch 'topic/ppc-kvm' into next ...

Merge in some commits we're sharing with the KVM tree.

I manually propagated the change from commit d3d4ffaae4
("powerpc/powernv/ioda2: Reduce upper limit for DMA window size") into
pci-ioda-tce.c.

Conflicts:
        arch/powerpc/include/asm/cputable.h
        arch/powerpc/platforms/powernv/pci-ioda.c
        arch/powerpc/platforms/powernv/pci.h

2018-07-19 14:37:57 +10:00

42 KiB

Raw Blame History

View Raw