From: Doug Ledford <dledford@redhat.com>
Date: Fri, 18 Aug 2017 18:10:23 +0000 (-0400)
Subject: Merge branch 'misc' into k.o/for-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d3cf4d9915c4fb60aeef580973aa77420e600746;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'misc' into k.o/for-next

Conflicts:
	drivers/infiniband/core/iwcm.c - The rdma_netlink patches in
	HEAD and the iwarp cm workqueue fix (don't use WQ_MEM_RECLAIM,
	we aren't safe for that context) touched the same code.

Signed-off-by: Doug Ledford <dledford@redhat.com>
---

d3cf4d9915c4fb60aeef580973aa77420e600746
diff --cc drivers/infiniband/core/device.c
index fbc92c649be8,9b7e110e7d8e..6a848f159380
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@@ -523,10 -489,9 +523,10 @@@ int ib_register_device(struct ib_devic
  	device->reg_state = IB_DEV_REGISTERED;
  
  	list_for_each_entry(client, &client_list, list)
- 		if (client->add && !add_client_context(device, client))
+ 		if (!add_client_context(device, client) && client->add)
  			client->add(device);
  
 +	device->index = __dev_new_index();
  	down_write(&lists_rwsem);
  	list_add_tail(&device->core_list, &device_list);
  	up_write(&lists_rwsem);
diff --cc drivers/infiniband/core/iwcm.c
index 452a3115e3e6,ff6d7bc44c1f..e33528e102f8
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@@ -1175,9 -1175,13 +1175,9 @@@ static int __init iw_cm_init(void
  	ret = iwpm_init(RDMA_NL_IWCM);
  	if (ret)
  		pr_err("iw_cm: couldn't init iwpm\n");
 -
 -	ret = ibnl_add_client(RDMA_NL_IWCM, ARRAY_SIZE(iwcm_nl_cb_table),
 -			      iwcm_nl_cb_table);
 -	if (ret)
 -		pr_err("iw_cm: couldn't register netlink callbacks\n");
 -
 +	else
 +		rdma_nl_register(RDMA_NL_IWCM, iwcm_nl_cb_table);
- 	iwcm_wq = alloc_ordered_workqueue("iw_cm_wq", WQ_MEM_RECLAIM);
+ 	iwcm_wq = alloc_ordered_workqueue("iw_cm_wq", 0);
  	if (!iwcm_wq)
  		return -ENOMEM;