diff options
author | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:10:23 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:10:23 -0400 |
commit | d3cf4d9915c4fb60aeef580973aa77420e600746 (patch) | |
tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d /drivers/infiniband/core/uverbs_main.c | |
parent | IB/hns: Avoid compile test under non 64bit environments (diff) | |
parent | IB/hfi1: add const to bin_attribute structures (diff) | |
download | linux-dev-d3cf4d9915c4fb60aeef580973aa77420e600746.tar.xz linux-dev-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/core/uverbs_main.c')
0 files changed, 0 insertions, 0 deletions