]> 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, 22 Feb 2019 02:52:30 +0000 (13:52 +1100)
committerPaul Mackerras <paulus@ozlabs.org>
Fri, 22 Feb 2019 02:52:30 +0000 (13:52 +1100)
commit87fb56d45c29548c024a4e533fb58bd06a561e16
treea5ba65815e0c2563844e52947274c0bdf63a790b
parente8374bd29a2843f107d8e0a97b1527a1451c3c9b
parent0dce762ce5a9f18173dc683d66f482c0cd668ab7
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 a
series of commits that touch both general arch/powerpc code and KVM
code.  These commits will be merged both via the KVM tree and the
powerpc tree.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
arch/powerpc/include/asm/kvm_ppc.h
arch/powerpc/kvm/book3s.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S