Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
authorPaul Mackerras <paulus@ozlabs.org>
Tue, 31 Jan 2017 08:21:26 +0000 (19:21 +1100)
committerPaul Mackerras <paulus@ozlabs.org>
Tue, 31 Jan 2017 08:21:26 +0000 (19:21 +1100)
This merges in the POWER9 radix MMU host and guest support, which
was put into a topic branch because it touches both powerpc and
KVM code.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
1  2 
arch/powerpc/include/uapi/asm/kvm.h
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rm_xics.c

Simple merge
Simple merge
Simple merge