linux-next: manual merge of the kvm tree with the arm tree

* linux-next: manual merge of the kvm tree with the arm tree
@ 2013-02-06  4:43 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-02-06  4:43 UTC (permalink / raw)
  To: Marcelo Tosatti, Gleb Natapov
  Cc: linux-next, linux-kernel, Marc Zyngier, Christoffer Dall,
	Russell King, Cornelia Huck, Alexander Graf

[-- Attachment #1: Type: text/plain, Size: 972 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
include/uapi/linux/kvm.h between commit aa024c2f35a0 ("KVM: ARM: Power
State Coordination Interface implementation") from the arm tree and
commits fa6b7fe9928d ("KVM: s390: Add support for channel I/O
instructions") and 1c810636556c ("KVM: PPC: BookE: Implement EPR exit")
from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/uapi/linux/kvm.h
index 7f2360a,9a2db57..0000000

--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -636,7 -660,8 +661,9 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_IRQFD_RESAMPLE 82
  #define KVM_CAP_PPC_BOOKE_WATCHDOG 83
  #define KVM_CAP_PPC_HTAB_FD 84
+ #define KVM_CAP_S390_CSS_SUPPORT 85
+ #define KVM_CAP_PPC_EPR 86
 +#define KVM_CAP_ARM_PSCI 87
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] only message in thread