]> 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, 23 Aug 2019 04:08:04 +0000 (14:08 +1000)
committerPaul Mackerras <paulus@ozlabs.org>
Fri, 23 Aug 2019 04:08:04 +0000 (14:08 +1000)
commit9a2ad1acf12f0a065fbe6d160e6eeba9542b6df2
tree1817fd08e5cf8a65e7958711c4e8b15554b4d5a2
parentbcc3539fdd6c80905a919423918eb07b589922ad
parent6b0e1b8141355b59294c8311bf73ff83952227ac
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in fixes for the XIVE interrupt controller which touch both
generic powerpc and PPC KVM code.  To avoid merge conflicts, these
commits will go upstream via the powerpc tree as well as the KVM tree.

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