Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Nov 2014 19:16:44 +0000 (11:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Nov 2014 19:16:44 +0000 (11:16 -0800)
commit3314bf6ba2ac8f1a2dd0d55a980835a258f1a45d
treeb6c81a616eb4a7a43a6fa4641c6554f4d25955b2
parentb914c5b2130239fd378d1a719ab3c53f0c782be9
parentd3fccc7ef831d1d829b4da5eaa081db55b1e38f3
Merge tag 'for-linus' of git://git./virt/kvm/kvm

Pull kvm fixes from Paolo Bonzini:
 "Last minute KVM/ARM fixes; even the generic change actually affects
  nothing but ARM"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: fix kvm_is_mmio_pfn() and rename to kvm_is_reserved_pfn()
  arm/arm64: kvm: drop inappropriate use of kvm_is_mmio_pfn()
  arm/arm64: KVM: vgic: Fix error code in kvm_vgic_create()
  arm64: KVM: Handle traps of ICC_SRE_EL1 as RAZ/WI
  arm64: KVM: fix unmapping with 48-bit VAs