Conflicts: arch/x86/kvm/vmx/vmx.c |
||
|---|---|---|
| .. | ||
| aarch64 | ||
| s390x | ||
| x86_64 | ||
| assert.c | ||
| elf.c | ||
| io.c | ||
| kvm_util.c | ||
| kvm_util_internal.h | ||
| sparsebit.c | ||
Conflicts: arch/x86/kvm/vmx/vmx.c |
||
|---|---|---|
| .. | ||
| aarch64 | ||
| s390x | ||
| x86_64 | ||
| assert.c | ||
| elf.c | ||
| io.c | ||
| kvm_util.c | ||
| kvm_util_internal.h | ||
| sparsebit.c | ||