diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2021-06-17 16:51:38 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-06-17 16:51:38 +1000 |
| commit | 3c53642324f526c0aba411bf8e6cf2ab2471192a (patch) | |
| tree | f603ab1fa6c3236618f721806327d4f21a8a1f83 /include/linux | |
| parent | powerpc/mm/book3s64: Fix possible build error (diff) | |
| parent | KVM: PPC: Book3S HV: remove ISA v3.0 and v3.1 support from P7/8 path (diff) | |
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
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions