linux-next: manual merge of the hyperv tree with the vfs-brauner tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/hv/mshv_root_main.c

between commit:

  12692f6b7689 ("hv: convert mshv_ioctl_create_partition() to FD_ADD()")

from the vfs-brauner tree and commit:

  c91fe5f162f2 ("mshv: Extend create partition ioctl to support cpu features")

from the hyperv 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 drivers/hv/mshv_root_main.c
index 1d8d8d00e4e0,bc15d6f6922f..000000000000
--- a/drivers/hv/mshv_root_main.c
+++ b/drivers/hv/mshv_root_main.c
@@@ -1900,6 -1974,26 +1977,24 @@@ static long mshv_ioctl_process_pt_flags
  		break;
  	}
  
+ 	return 0;
+ }
+ 
+ static long
+ mshv_ioctl_create_partition(void __user *user_arg, struct device *module_dev)
+ {
+ 	u64 creation_flags;
+ 	struct hv_partition_creation_properties creation_properties;
+ 	union hv_partition_isolation_properties isolation_properties;
+ 	struct mshv_partition *partition;
 -	struct file *file;
 -	int fd;
+ 	long ret;
+ 
+ 	ret = mshv_ioctl_process_pt_flags(user_arg, &creation_flags,
+ 					  &creation_properties,
+ 					  &isolation_properties);
+ 	if (ret)
+ 		return ret;
+ 
  	partition = kzalloc(sizeof(*partition), GFP_KERNEL);
  	if (!partition)
  		return -ENOMEM;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]