From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Apr 2014 23:21:28 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v5.15~18055
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=55101e2d6ce1c780f6ee8fee5f37306971aac6cd;p=mirror_ubuntu-kernels.git

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)
---

55101e2d6ce1c780f6ee8fee5f37306971aac6cd