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)
commit75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37
tree1817fd08e5cf8a65e7958711c4e8b15554b4d5a2
parent3bda7f0ae0f786b202c0c5124c208be067acca30
parentda15c03b047dca891d37b9f4ef9ca14d84a6484f
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