Skip to content
Commit d3cf4d99 authored by Doug Ledford's avatar Doug Ledford
Browse files

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: default avatarDoug Ledford <dledford@redhat.com>
parents 3e5f0881 9d6fd7ac
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment