linux-next: manual merge of the cel tree with the cel-fixes tree

linux-next: manual merge of the cel tree with the cel-fixes tree

[Stephen Rothwell]

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

Hi all,

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

  net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

between commit:

  bade4be69a6e ("svcrdma: Revert "svcrdma: Reduce Receive doorbell rate"")

from the cel-fixes tree and commit:

  898d455e7277 ("svcrdma: Add a "deferred close" helper")

from the cel 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/xprtrdma/svc_rdma_recvfrom.c
index 7d34290e2ff8,d7ebecf4e512..000000000000
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@@ -356,10 -351,16 +354,9 @@@ static void svc_rdma_wc_receive(struct 
  	return;
  
  flushed:
 -	svc_rdma_recv_ctxt_put(rdma, ctxt);
  post_err:
 +	svc_rdma_recv_ctxt_put(rdma, ctxt);
- 	set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags);
- 	svc_xprt_enqueue(&rdma->sc_xprt);
+ 	svc_xprt_deferred_close(&rdma->sc_xprt);
  }
  
  /**

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