]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitce996dcd1765b883a37cb37bf2cec95d04780f88
tree9334fc694bc5c9710563d3381b395b6985b09bcd
parent9b3ba36095d0fe4ace7a94fa411734a70b2bcbe8
parent53e110dbdf7c6cb5dacefa6d38b7d2a5fa4e096d
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