diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-13 22:32:50 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-13 22:32:50 +0300 |
| commit | 58f800d5ace99c49e6418cb5757d868f2746acb4 (patch) | |
| tree | 5e6d8e459f282e35b8b8245a39de838a2c364d42 /tools/perf/scripts/python/syscall-counts-by-pid.py | |
| parent | 1330a0170a48ad3788eff01aaf889203652ab4c7 (diff) | |
| parent | 73917739334c6509833b0403b81d4a04a8784bdf (diff) | |
| download | linux-58f800d5ace99c49e6418cb5757d868f2746acb4.tar.xz | |
Merge branch 'kvm-master' into HEAD
This merge brings in a couple important SMM fixes, which makes it
easier to test latest KVM with unrestricted_guest=0 and to test
the in-progress work on SMM support in the firmware.
Conflicts:
arch/x86/kvm/x86.c
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts-by-pid.py')
0 files changed, 0 insertions, 0 deletions