]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 17 Jun 2021 06:51:38 +0000 (16:51 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 17 Jun 2021 06:51:38 +0000 (16:51 +1000)
commit3f1f4a7a55d980f23a2227ab55b93c85faabe71a
treef603ab1fa6c3236618f721806327d4f21a8a1f83
parent3d446169c70d1e3e2a1934d01e5e0e11bdbc043f
parenta47e8004c005ffc0c0e094f5ebfd58d942c940a8
Merge branch 'topic/ppc-kvm' into next

Merge some powerpc KVM patches from our topic branch.

In particular this brings in Nick's big series rewriting parts of the
guest entry/exit path in C.

Conflicts:
arch/powerpc/kernel/security.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/include/asm/mmu_context.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/security.c
arch/powerpc/kvm/book3s_hv_rm_mmu.c
arch/powerpc/mm/book3s64/radix_tlb.c