Merge branch 'misc' into k.o/for-next

Browse source

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>

...

This commit is contained in:

Doug Ledford 2017-08-18 14:10:23 -04:00

parent 3e5f0881f1 9d6fd7aca1

commit d3cf4d9915

22 changed files with 53 additions and 95 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/linux/pci.h

View file

3

include/rdma/ib_addr.h

View file