Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
authorPaul Mackerras <paulus@ozlabs.org>
Wed, 1 Nov 2017 04:33:39 +0000 (15:33 +1100)
committerPaul Mackerras <paulus@ozlabs.org>
Wed, 1 Nov 2017 04:33:39 +0000 (15:33 +1100)
This merges in the ppc-kvm topic branch of the powerpc tree to get the
commit that reverts the patch "KVM: PPC: Book3S HV: POWER9 does not
require secondary thread management".  This is needed for subsequent
patches which will be applied on this branch.

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

Simple merge