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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in:

  arch/arm64/kvm/arm.c

between commit:

  d8708b80fa0e ("KVM: Change return type of kvm_arch_vm_ioctl() to "int"")

from the kvm tree and commit:

  e0fc6b21616d ("KVM: arm64: Add vm fd device attribute accessors")

from the kvm-arm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/kvm/arm.c
index aaa752be3776,4ec888fdd4f7..000000000000
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@@ -220,7 -234,7 +234,8 @@@ int kvm_vm_ioctl_check_extension(struc
  	case KVM_CAP_VCPU_ATTRIBUTES:
  	case KVM_CAP_PTP_KVM:
  	case KVM_CAP_ARM_SYSTEM_SUSPEND:
 +	case KVM_CAP_IRQFD_RESAMPLE:
+ 	case KVM_CAP_COUNTER_OFFSET:
  		r = 1;
  		break;
  	case KVM_CAP_SET_GUEST_DEBUG2:
@@@ -1440,7 -1475,28 +1476,27 @@@ static int kvm_vm_ioctl_set_device_addr
  	}
  }
  
+ static int kvm_vm_has_attr(struct kvm *kvm, struct kvm_device_attr *attr)
+ {
+ 	switch (attr->group) {
+ 	case KVM_ARM_VM_SMCCC_CTRL:
+ 		return kvm_vm_smccc_has_attr(kvm, attr);
+ 	default:
+ 		return -ENXIO;
+ 	}
+ }
+ 
+ static int kvm_vm_set_attr(struct kvm *kvm, struct kvm_device_attr *attr)
+ {
+ 	switch (attr->group) {
+ 	case KVM_ARM_VM_SMCCC_CTRL:
+ 		return kvm_vm_smccc_set_attr(kvm, attr);
+ 	default:
+ 		return -ENXIO;
+ 	}
+ }
+ 
 -long kvm_arch_vm_ioctl(struct file *filp,
 -		       unsigned int ioctl, unsigned long arg)
 +int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
  {
  	struct kvm *kvm = filp->private_data;
  	void __user *argp = (void __user *)arg;

Attachment: pgpVtWVeMcHIq.pgp
Description: OpenPGP digital signature