tree 348adcfd97517ee9b5041f31df15cdd7fedb8ea7
parent dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53
parent b351c39cc9e0151cee9b8d52a1e714928faabb38
author Linus Torvalds <torvalds@linux-foundation.org> 1397517688 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1397517688 -0700

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fixes from Marcelo Tosatti:
 - Fix for guest triggerable BUG_ON (CVE-2014-0155)
 - CR4.SMAP support
 - Spurious WARN_ON() fix

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: remove WARN_ON from get_kernel_ns()
  KVM: Rename variable smep to cr4_smep
  KVM: expose SMAP feature to guest
  KVM: Disable SMAP for guests in EPT realmode and EPT unpaging mode
  KVM: Add SMAP support when setting CR4
  KVM: Remove SMAP bit from CR4_RESERVED_BITS
  KVM: ioapic: try to recover if pending_eoi goes out of range
  KVM: ioapic: fix assignment of ioapic->rtc_status.pending_eoi (CVE-2014-0155)