linux-next: manual merge of the net-next tree with the vfs tree

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

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

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/compat.c between commit 774157aa4897 ("net: switch importing msghdr
from userland to {compat_,}import_iovec()") from the vfs tree and
commit 0345f93138b2 ("net: socket: add support for async operations")
from the net-next 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 net/compat.c
index 0e34814592e6,c4b6b0f43d5d..000000000000
--- a/net/compat.c
+++ b/net/compat.c
@@@ -79,9 -79,15 +79,11 @@@ int get_compat_msghdr(struct msghdr *km
  	if (nr_segs > UIO_MAXIOV)
  		return -EMSGSIZE;
  
+ 	kmsg->msg_iocb = NULL;
+ 
 -	err = compat_rw_copy_check_uvector(save_addr ? READ : WRITE,
 -					   compat_ptr(uiov), nr_segs,
 -					   UIO_FASTIOV, *iov, iov);
 -	if (err >= 0)
 -		iov_iter_init(&kmsg->msg_iter, save_addr ? READ : WRITE,
 -			      *iov, nr_segs, err);
 -	return err;
 +	return compat_import_iovec(save_addr ? READ : WRITE,
 +				   compat_ptr(uiov), nr_segs,
 +				   UIO_FASTIOV, iov, &kmsg->msg_iter);
  }
  
  /* Bleech... */

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