]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 19 Jul 2018 04:37:57 +0000 (14:37 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 19 Jul 2018 04:37:57 +0000 (14:37 +1000)
commitce57c6610cc2d7cde61fc005a2d2090bce46fc73
treebe1230fb1773e3de7fb7f6a0adde68ca0468273e
parent9c3250a127901c93b23723dc5859c71a0d068fb8
parenta68bd1267b7286b1687905651b404e765046de25
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
arch/powerpc/include/asm/book3s/64/pgtable.h
arch/powerpc/include/asm/cputable.h
arch/powerpc/kernel/cputable.c
arch/powerpc/kernel/dt_cpu_ftrs.c
arch/powerpc/mm/hugetlbpage.c
arch/powerpc/mm/tlb-radix.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.h
arch/powerpc/xmon/xmon.c
drivers/misc/cxl/cxl.h
drivers/misc/cxl/pci.c