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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 14 Jun 2019 13:00:33 +1000

Hi all,

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

  drivers/infiniband/core/uverbs_cmd.c
  drivers/infiniband/core/uverbs_std_types_cq.c

between commit:

  6876aaedc8a1 ("RDMA/uverbs: Pass udata on uverbs error unwind")

from Linus' tree and commit:

  e39afe3d6dbd ("RDMA: Convert CQ allocations to be under core responsibility")

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/uverbs_cmd.c
index 63fe14c7c68f,5c00d9a5698a..000000000000
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@@ -1053,8 -1045,10 +1056,10 @@@ static struct ib_ucq_object *create_cq(
  	return obj;
  
  err_cb:
 -	ib_destroy_cq(cq);
 +	ib_destroy_cq_user(cq, uverbs_get_cleared_udata(attrs));
- 
+ 	cq = NULL;
+ err_free:
+ 	kfree(cq);
  err_file:
  	if (ev_file)
  		ib_uverbs_release_ucq(attrs->ufile, ev_file, obj);
diff --cc drivers/infiniband/core/uverbs_std_types_cq.c
index 07ea4e3c4566,06b8c7d017b7..000000000000
--- a/drivers/infiniband/core/uverbs_std_types_cq.c
+++ b/drivers/infiniband/core/uverbs_std_types_cq.c
@@@ -135,8 -140,10 +140,10 @@@ static int UVERBS_HANDLER(UVERBS_METHOD
  
  	return 0;
  err_cq:
 -	ib_destroy_cq(cq);
 +	ib_destroy_cq_user(cq, uverbs_get_cleared_udata(attrs));
- 
+ 	cq = NULL;
+ err_free:
+ 	kfree(cq);
  err_event_file:
  	if (ev_file)
  		uverbs_uobject_put(ev_file_uobj);