diff options
| author | Doug Ledford <[email protected]> | 2017-08-18 14:10:23 -0400 |
|---|---|---|
| committer | Doug Ledford <[email protected]> | 2017-08-18 14:10:23 -0400 |
| commit | d3cf4d9915c4fb60aeef580973aa77420e600746 (patch) | |
| tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d /tools/perf/scripts/python | |
| 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 <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions