linux-next: manual merge of the nfsd tree with the nfs-anna tree

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

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

Hi all,

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

  net/sunrpc/svc_xprt.c

between commit:

  2baebf955125 ("SUNRPC: Split the xdr_buf event class")

from the nfs-anna tree and commit:

  ca4faf543a33 ("SUNRPC: Move xpt_mutex into socket xpo_sendto methods")

from the nfsd 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/svc_xprt.c
index 8ef44275c255,c1ff8cdb5b2b..000000000000
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@@ -913,17 -906,11 +906,11 @@@ int svc_send(struct svc_rqst *rqstp
  	xb->len = xb->head[0].iov_len +
  		xb->page_len +
  		xb->tail[0].iov_len;
 -	trace_svc_sendto(xb);
 +	trace_svc_xdr_sendto(rqstp, xb);
- 
- 	/* Grab mutex to serialize outgoing data. */
- 	mutex_lock(&xprt->xpt_mutex);
  	trace_svc_stats_latency(rqstp);
- 	if (test_bit(XPT_DEAD, &xprt->xpt_flags)
- 			|| test_bit(XPT_CLOSE, &xprt->xpt_flags))
- 		len = -ENOTCONN;
- 	else
- 		len = xprt->xpt_ops->xpo_sendto(rqstp);
- 	mutex_unlock(&xprt->xpt_mutex);
+ 
+ 	len = xprt->xpt_ops->xpo_sendto(rqstp);
+ 
  	trace_svc_send(rqstp, len);
  	svc_xprt_release(rqstp);
  

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