OpenCloudOS-Kernel/drivers/infiniband/ulp
David S. Miller 27058af401 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-10-30 12:42:58 -04:00
..
ipoib Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-30 12:42:58 -04:00
iser IB/iser: use IB_PD_UNSAFE_GLOBAL_RKEY 2016-09-23 13:47:44 -04:00
isert Merge of primary rdma-core code for 4.9 2016-10-09 17:04:33 -07:00
srp IB/srp: Fix infinite loop when FMR sg[0].offset != 0 2016-10-07 16:54:39 -04:00
srpt Merge of primary rdma-core code for 4.9 2016-10-09 17:04:33 -07:00
Makefile IB: Allow build of hw/ and ulp/ subdirectories independently 2014-06-02 14:51:12 -07:00