]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf9d135be0a30b8f35e69555c889b5a441e0aed44
treed1ce5e0563befbdc5c777dc008e8d1ae029320b6
parent7bb77005eb5a3e90bb3ec8d68f6afba238142405
parent44df269f4f175774ac3527cc2632b73a9c727324
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