diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-18 21:10:23 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 21:10:23 +0300 |
| commit | d3cf4d9915c4fb60aeef580973aa77420e600746 (patch) | |
| tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d /drivers/infiniband/core/iwcm.c | |
| parent | 3e5f0881f17525e3b49835947a5e0cf2d681b1e2 (diff) | |
| parent | 9d6fd7aca149e2c95915447f76b125dc2123db45 (diff) | |
| download | linux-d3cf4d9915c4fb60aeef580973aa77420e600746.tar.xz | |
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>
Diffstat (limited to 'drivers/infiniband/core/iwcm.c')
| -rw-r--r-- | drivers/infiniband/core/iwcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c index 452a3115e3e6..e33528e102f8 100644 --- a/drivers/infiniband/core/iwcm.c +++ b/drivers/infiniband/core/iwcm.c @@ -1177,7 +1177,7 @@ static int __init iw_cm_init(void) pr_err("iw_cm: couldn't init iwpm\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; |