linux/drivers/infiniband/ulp
David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-09 15:59:24 -04:00
..
ipoib treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
iser IB/iser: Fix max_sectors calculation 2016-05-05 12:41:24 -04:00
isert iser-target: Use ib_drain_qp 2016-03-30 20:05:15 -07:00
srp IB/srp: Use ib_drain_rq() 2016-02-29 17:10:27 -05:00
srpt Revert "ib_srpt: Convert to percpu_ida tag allocation" 2016-04-07 18:16:20 -07:00
Makefile