diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-18 20:10:23 +0200 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 20:10:23 +0200 |
| commit | d3cf4d9915c4fb60aeef580973aa77420e600746 (patch) | |
| tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d /drivers/infiniband/hw/bnxt_re | |
| parent | IB/hns: Avoid compile test under non 64bit environments (diff) | |
| parent | IB/hfi1: add const to bin_attribute structures (diff) | |
| download | linux-d3cf4d9915c4fb60aeef580973aa77420e600746.tar.xz linux-d3cf4d9915c4fb60aeef580973aa77420e600746.zip | |
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/hw/bnxt_re')
| -rw-r--r-- | drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c index d78fedc654d0..58461ee3773d 100644 --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c @@ -3372,7 +3372,7 @@ int bnxt_re_dealloc_ucontext(struct ib_ucontext *ib_uctx) &rdev->qplib_res.dpi_tbl, &uctx->dpi); if (rc) - dev_err(rdev_to_dev(rdev), "Deallocte HW DPI failed!"); + dev_err(rdev_to_dev(rdev), "Deallocate HW DPI failed!"); /* Don't fail, continue*/ uctx->dpi.dbr = NULL; } |