diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2019-11-21 12:01:51 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-11-21 14:03:40 +0300 |
commit | 46f4f0aabc61bfd365e1eb3c8a6d766d1a49cf32 (patch) | |
tree | f98a256ff3e4b20ca6252f7f80ce17759e57c6f2 /tools/testing/selftests/kvm/kvm_create_max_vcpus.c | |
parent | 14edff88315add29099fd8eebb9ef989c2e47c18 (diff) | |
parent | b07a5c53d42a8c87b208614129e947dd2338ff9c (diff) | |
download | linux-46f4f0aabc61bfd365e1eb3c8a6d766d1a49cf32.tar.xz |
Merge branch 'kvm-tsx-ctrl' into HEAD
Conflicts:
arch/x86/kvm/vmx/vmx.c
Diffstat (limited to 'tools/testing/selftests/kvm/kvm_create_max_vcpus.c')
0 files changed, 0 insertions, 0 deletions