summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-01 16:43:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-01 16:43:25 -0400
commitccf70ddcbe9984cee406be2bacfedd5e4776919d (patch)
treef9aaf50eab789d1cd8ce79a2e9e5804d86decfbc /drivers/net
parent46c8217c4a54c17dd4c000ad804fa1e223a10578 (diff)
parentd2922422c48df93f3edff7d872ee4f3191fefb08 (diff)
downloadlwn-ccf70ddcbe9984cee406be2bacfedd5e4776919d.tar.gz
lwn-ccf70ddcbe9984cee406be2bacfedd5e4776919d.zip
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini: "(Relatively) a lot of reverts, mostly. Bugs have trickled in for a new feature in 4.2 (MTRR support in guests) so I'm reverting it all; let's not make this -rc period busier for KVM than it's been so far. This covers the four reverts from me. The fifth patch is being reverted because Radim found a bug in the implementation of stable scheduler clock, *but* also managed to implement the feature entirely without hypervisor support. So instead of fixing the hypervisor side we can remove it completely; 4.4 will get the new implementation" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: Use WARN_ON_ONCE for missing X86_FEATURE_NRIPS Update KVM homepage Url Revert "KVM: SVM: use NPT page attributes" Revert "KVM: svm: handle KVM_X86_QUIRK_CD_NW_CLEARED in svm_get_mt_mask" Revert "KVM: SVM: Sync g_pat with guest-written PAT value" Revert "KVM: x86: apply guest MTRR virtualization on host reserved pages" Revert "KVM: x86: zero kvmclock_offset when vcpu0 initializes kvmclock system MSR"
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions