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>
Doug Ledford <dledford@redhat.com>
Loading
Please register or sign in to comment
