| commit | ce57c6610cc2d7cde61fc005a2d2090bce46fc73 | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Thu Jul 19 14:37:57 2018 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Thu Jul 19 14:37:57 2018 +1000 |
| tree | be1230fb1773e3de7fb7f6a0adde68ca0468273e | |
| parent | 9c3250a127901c93b23723dc5859c71a0d068fb8 [diff] | |
| parent | a68bd1267b7286b1687905651b404e765046de25 [diff] |
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 d3d4ffaae439
("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