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

[Stephen Rothwell]

Hi Al,

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

  net/sunrpc/svcsock.c

between commit:

  64dbf4dc5496 ("SUNRPC: Simplify TCP receive code")

from the nfsd tree and commit:

  aa563d7bca6e ("iov_iter: Separate type from direction and use accessor functions")

from the vfs 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 net/sunrpc/svcsock.c
index 3b525accaa68,0b46ec0bf74e..000000000000
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@@ -336,12 -338,8 +336,12 @@@ static ssize_t svc_recvfrom(struct svc_
  	rqstp->rq_xprt_hlen = 0;
  
  	clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
- 	iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, iov, nr, buflen);
+ 	iov_iter_kvec(&msg.msg_iter, READ, iov, nr, buflen);
 -	len = sock_recvmsg(svsk->sk_sock, &msg, msg.msg_flags);
 +	if (base != 0) {
 +		iov_iter_advance(&msg.msg_iter, base);
 +		buflen -= base;
 +	}
 +	len = sock_recvmsg(svsk->sk_sock, &msg, MSG_DONTWAIT);
  	/* If we read a full record, then assume there may be more
  	 * data to read (stream based sockets only!)
  	 */

Attachment: pgpHu9tBApWQ3.pgp
Description: OpenPGP digital signature