| commit | 46f4f0aabc61bfd365e1eb3c8a6d766d1a49cf32 | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Thu Nov 21 10:01:51 2019 +0100 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Thu Nov 21 12:03:40 2019 +0100 |
| tree | f98a256ff3e4b20ca6252f7f80ce17759e57c6f2 | |
| parent | 14edff88315add29099fd8eebb9ef989c2e47c18 [diff] | |
| parent | b07a5c53d42a8c87b208614129e947dd2338ff9c [diff] |
Merge branch 'kvm-tsx-ctrl' into HEAD Conflicts: arch/x86/kvm/vmx/vmx.c