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>

diff --cc drivers/infiniband/core/cm.c
Simple merge

diff --cc drivers/infiniband/core/device.c
index fbc92c649be85dfca79dbc00b18f6c46f4733b9e,9b7e110e7d8ecb81504a8ccbef703d1b47a826bd..6a848f1593808fe7c90c110875b632e1f9eff949
--- 1/drivers/infiniband/core/device.c
--- 2/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 452a3115e3e6baafe181fe94185e9782ce5eed15,ff6d7bc44c1f2ea8a36cbc2122abe22d20658c87..e33528e102f89a9a2dd639f7e65748e50d49990c
--- 1/drivers/infiniband/core/iwcm.c
--- 2/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;
  

diff --cc drivers/infiniband/core/uverbs_cmd.c
Simple merge

diff --cc drivers/infiniband/hw/bnxt_re/ib_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/hfi1/chip.c
Simple merge

diff --cc drivers/infiniband/hw/mthca/mthca_main.c
Simple merge

diff --cc drivers/infiniband/hw/nes/nes.c
Simple merge

diff --cc drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
Simple merge

diff --cc drivers/nvme/host/rdma.c
Simple merge

diff --cc include/rdma/ib_addr.h
Simple merge