| commit | d3cf4d9915c4fb60aeef580973aa77420e600746 | [log] [tgz] |
|---|---|---|
| author | Doug Ledford <dledford@redhat.com> | Fri Aug 18 14:10:23 2017 -0400 |
| committer | Doug Ledford <dledford@redhat.com> | Fri Aug 18 14:10:23 2017 -0400 |
| tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d | |
| parent | 3e5f0881f17525e3b49835947a5e0cf2d681b1e2 [diff] | |
| parent | 9d6fd7aca149e2c95915447f76b125dc2123db45 [diff] |
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>