Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
authorPaul Mackerras <paulus@ozlabs.org>
Wed, 8 Feb 2017 08:35:34 +0000 (19:35 +1100)
committerPaul Mackerras <paulus@ozlabs.org>
Wed, 8 Feb 2017 08:35:34 +0000 (19:35 +1100)
commita4a741a04814170358f470d7103f8b13ceb6fefc
treed1ce5e0563befbdc5c777dc008e8d1ae029320b6
parent050f23390f6bdbfa7dd2800884d32490489851b7
parentab9bad0ead9ab179ace09988a3f1cfca122eb7c2
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in a fix which touches both PPC and KVM code,
which was therefore put into a topic branch in the powerpc
tree.

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