From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 30 May 2014 12:51:40 +0000 (+0200)
Subject: Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=53ea2e462e1b5b898d244bb113993df709107e32;p=linux-beck.git

Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-next

Patch queue for ppc - 2014-05-30

In this round we have a few nice gems. PR KVM gains initial POWER8 support
as well as LE host awareness, ihe e500 targets can now properly run u-boot,
LE guests now work with PR KVM including KVM hypercalls and HV KVM guests
can now use huge pages.

On top of this there are some bug fixes.

Conflicts:
	include/uapi/linux/kvm.h
---

53ea2e462e1b5b898d244bb113993df709107e32
diff --cc include/uapi/linux/kvm.h
index 32cf446f1911,16c923de85e7..e11d8f170a62
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -756,7 -748,7 +756,8 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_S390_IRQCHIP 99
  #define KVM_CAP_IOEVENTFD_NO_LENGTH 100
  #define KVM_CAP_VM_ATTRIBUTES 101
 -#define KVM_CAP_PPC_FIXUP_HCALL 102
 +#define KVM_CAP_ARM_PSCI_0_2 102
++#define KVM_CAP_PPC_FIXUP_HCALL 103
  
  #ifdef KVM_CAP_IRQ_ROUTING