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 /arch/powerpc/lib/feature-fixups.c | |
| parent | 07d8ad6fd8a3d47f50595ca4826f41dbf4f3a0c6 (diff) | |
| parent | fae5c9f3664ba278137e54a2083b39b90c64093a (diff) | |
| download | linux-3c53642324f526c0aba411bf8e6cf2ab2471192a.tar.gz linux-3c53642324f526c0aba411bf8e6cf2ab2471192a.tar.bz2 linux-3c53642324f526c0aba411bf8e6cf2ab2471192a.zip | |
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 'arch/powerpc/lib/feature-fixups.c')
0 files changed, 0 insertions, 0 deletions