Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
authorPaul Mackerras <paulus@ozlabs.org>
Tue, 30 Apr 2019 09:32:47 +0000 (19:32 +1000)
committerPaul Mackerras <paulus@ozlabs.org>
Tue, 30 Apr 2019 09:32:47 +0000 (19:32 +1000)
commita878957a817c674a99bd6741188aeaf95cc99247
tree04856793cf5dd3a226e61321d1d329b1303a7855
parent44b198aee1f2649534bdf08bfd7517c56da2ed7e
parentc1fe190c06723322f2dfac31d3b982c581e434ef
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in the ppc-kvm topic branch from the powerpc tree to get
patches which touch both general powerpc code and KVM code, one of
which is a prerequisite for following patches.

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