mirror_ubuntu-kernels/drivers/infiniband/hw
David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-09-12 15:52:44 -07:00
..
cxgb3 Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8 2016-08-03 20:58:45 -04:00
cxgb4 IB/cxgb4: Make _free_qp static to silence build warning 2016-09-02 13:46:33 -04:00
hfi1 IB/hfi1: Rework debugfs to use SRCU 2016-09-02 14:26:55 -04:00
i40iw i40iw: Receive notification events correctly 2016-08-26 09:59:13 -04:00
mlx4 IB/mlx4: Don't return errors from poll_cq 2016-09-02 14:11:38 -04:00
mlx5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
mthca Merge branches 'misc' and 'rxe' into k.o/for-4.8-1 2016-08-04 11:13:47 -04:00
nes IB/nes: Support device FW version string 2016-06-23 12:08:34 -04:00
ocrdma RDMA/ocrdma: Fix the max_sge reported from FW 2016-08-24 11:31:40 -04:00
qib IB/qib: Use memdup_user() rather than duplicating its implementation 2016-08-23 12:38:24 -04:00
usnic IB/usnic: Fix error return code 2016-08-22 14:31:43 -04:00
Makefile IB/hfi1: Move driver out of staging 2016-05-26 11:35:14 -04:00