Subject: linux-next: manual merge of the rdma tree with the rdma-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 22 Mar 2018 11:45:28 +1100

Hi all,

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

  drivers/infiniband/core/ucma.c

between commit:

  e8980d67d601 ("RDMA/ucma: Ensure that CM_ID exists prior to access it")

from the rdma-fixes tree and commit:

  00313983cda6 ("DMA/nldev: provide detailed CM_ID information")

from the rdma 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/infiniband/core/ucma.c
index e5a1e7d81326,4bb5bed596c9..000000000000
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@@ -477,10 -476,10 +477,10 @@@ static ssize_t ucma_create_id(struct uc
  		return -ENOMEM;
  
  	ctx->uid = cmd.uid;
- 	cm_id = rdma_create_id(current->nsproxy->net_ns,
- 			       ucma_event_handler, ctx, cmd.ps, qp_type);
 -	ctx->cm_id = __rdma_create_id(current->nsproxy->net_ns,
 -			      ucma_event_handler, ctx, cmd.ps, qp_type, NULL);
 -	if (IS_ERR(ctx->cm_id)) {
 -		ret = PTR_ERR(ctx->cm_id);
++	cm_id = __rdma_create_id(current->nsproxy->net_ns,
++				ucma_event_handler, ctx, cmd.ps, qp_type, NULL);
 +	if (IS_ERR(cm_id)) {
 +		ret = PTR_ERR(cm_id);
  		goto err1;
  	}