Merge tag 'kvm-ppc-fixes-5.7-1' into topic/ppc-kvm
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 5 May 2020 11:16:47 +0000 (21:16 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 5 May 2020 11:16:47 +0000 (21:16 +1000)
commitf2b8d76dc6db379160ad8875f97336db2069e7bd
tree9334fc694bc5c9710563d3381b395b6985b09bcd
parentae83d0b416db002fe95601e7f97f64b59514d936
parentae49dedaa92b55258544aace7c585094b862ef79
Merge tag 'kvm-ppc-fixes-5.7-1' into topic/ppc-kvm

This brings in a fix from the kvm-ppc tree that was merged to mainline
after rc2, and so isn't in the base of our topic branch. We'd like it
in the topic branch because it interacts with patches we plan to carry
in this branch.
arch/powerpc/kvm/book3s_64_mmu_hv.c
arch/powerpc/kvm/book3s_64_mmu_radix.c