Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
authorPaul Mackerras <paulus@ozlabs.org>
Fri, 19 Jan 2018 01:09:57 +0000 (12:09 +1100)
committerPaul Mackerras <paulus@ozlabs.org>
Fri, 19 Jan 2018 01:09:57 +0000 (12:09 +1100)
commit6a69638e40e593219fb8e53b942fc4e19c928a87
tree4c5a99fd7cff7c9da1f858fdfccf8dc1cc6c597b
parentd3c3bcb9cc8d7e7a20f6dce7851ebf060bbd827f
parent941a069844ae874eb816f7e1684948411a91b153
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in the ppc-kvm topic branch of the powerpc tree to get
two patches which are prerequisites for the following patch series,
plus another patch which touches both powerpc and KVM code.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/powerpc.c