]> 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>
Fri, 19 Jan 2018 01:09:57 +0000 (12:09 +1100)
committerPaul Mackerras <paulus@ozlabs.org>
Fri, 19 Jan 2018 01:09:57 +0000 (12:09 +1100)
commit102043ca7117ec30a6b96c37358fe1e2c26afc07
tree4c5a99fd7cff7c9da1f858fdfccf8dc1cc6c597b
parent062c295b8290ab28387afb65112c656a19648502
parent3f49f8e4858b2046496e1b6dc8294ca72aa7e024
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
two patches which are prerequisites for the following patch series,
plus another patch which touches both powerpc and KVM code.

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