Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 23 Mar 2018 21:43:18 +0000 (08:43 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 23 Mar 2018 21:43:18 +0000 (08:43 +1100)
commita26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a
tree1d2061bbf8ac521bb9839075beb4263752bebb23
parent78e5dfea84dc15d69940831b3981b3014d17222e
parent681c617b7c42fce0798c2b0b472f270f28c82d56
Merge branch 'topic/ppc-kvm' into next

This brings in two series from Paul, one of which touches KVM code and
may need to be merged into the kvm-ppc tree to resolve conflicts.
arch/powerpc/include/asm/asm-prototypes.h
arch/powerpc/include/asm/paca.h
arch/powerpc/include/asm/ppc-opcode.h
arch/powerpc/include/asm/time.h
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kvm/powerpc.c