OSDN Git Service

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)
commit3e8f150a3bc30214c15e5f8d27e4b2d904bd929e
tree0b7aec14c8340153c58fb7354f923ec4a1bb4e7a
parent93897a1f4b1a96171b4a445207a371df1b0d4601
parent2a3d6553cbd791da4fb624c2500b4580b3f9d72f
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 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>
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S