| commit | 067f508c43728e08cfd9110a5e74cd4db4fa3a3e | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 22 Oct 2010 15:47:58 +0000 (22 13:47 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Fri, 22 Oct 2010 15:47:58 +0000 (22 13:47 -0200) | ||
| tree | 19ee0fada84cb6972115ec95409d489f8e887ce2 | treesnapshot (tar.gz zip) |
| parent | 9de479a97aeda2820f4408a760d3152a60cc9bb7 | commitdiff |
| parent | 18efa4c3abdb6ee932a637900b66c146c3df958d | commitdiff |
Merge branch 'upstream-merge'
* upstream-merge:
curses: Fix control-{@[\]^_} and ESC
kvm: save/restore x86-64 MSRs on x86-64 kernels
kvm: writeback SMP TSCs on migration only
kvm: factor out kvm_has_msr_star
kvm: add save/restore of MSR_VM_HSAVE_PA
Fix build on !KVM_CAP_MCE
x86, mce: broadcast mce depending on the cpu version
x86, mce: ignore SRAO only when MCG_SER_P is available
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* upstream-merge:
curses: Fix control-{@[\]^_} and ESC
kvm: save/restore x86-64 MSRs on x86-64 kernels
kvm: writeback SMP TSCs on migration only
kvm: factor out kvm_has_msr_star
kvm: add save/restore of MSR_VM_HSAVE_PA
Fix build on !KVM_CAP_MCE
x86, mce: broadcast mce depending on the cpu version
x86, mce: ignore SRAO only when MCG_SER_P is available
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>