From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Jul 2015 19:23:06 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v4.2~154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c624406fe6275f7fe6e3bf7ea4ddda60637fd3ab;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'for-linus' of git://git./virt/kvm/kvm

Pull KVM fixes from Paolo Bonzini:
 "Everything related to the new quirks and memory type features:

   - small improvements to the quirks API

   - extending one of the quirks from just AMD to Intel as well, because
     4.2 can show the same problem with problematic firmware on Intel
     too"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: rename quirk constants to KVM_X86_QUIRK_*
  KVM: vmx: obey KVM_QUIRK_CD_NW_CLEARED
  KVM: x86: introduce kvm_check_has_quirk
  KVM: MTRR: simplify kvm_mtrr_get_guest_memory_type
  KVM: MTRR: fix memory type handling if MTRR is completely disabled
---

c624406fe6275f7fe6e3bf7ea4ddda60637fd3ab