diff options
| author | Doug Ledford <[email protected]> | 2017-08-18 18:10:23 +0000 |
|---|---|---|
| committer | Doug Ledford <[email protected]> | 2017-08-18 18:10:23 +0000 |
| commit | d3cf4d9915c4fb60aeef580973aa77420e600746 (patch) | |
| tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d /drivers/infiniband/hw/mlx4/alias_GUID.c | |
| parent | IB/hns: Avoid compile test under non 64bit environments (diff) | |
| parent | IB/hfi1: add const to bin_attribute structures (diff) | |
| download | kernel-d3cf4d9915c4fb60aeef580973aa77420e600746.tar.gz kernel-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 <[email protected]>
Diffstat (limited to 'drivers/infiniband/hw/mlx4/alias_GUID.c')
0 files changed, 0 insertions, 0 deletions