David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
bnxt_re	RDMA: Use ib_gid_attr during GID modification	2018-04-03 21:34:16 -06:00
cxgb3	RDMA/cxgb3: Use structs to describe the uABI instead of opencoding	2018-03-22 12:42:48 -06:00
cxgb4	iw_cxgb4: Fix an error handling path in 'c4iw_get_dma_mr()'	2018-05-09 10:45:19 -04:00
hfi1	IB/hfi1: Use after free race condition in send context error path	2018-05-09 10:39:50 -04:00
hns	RDMA/hns: Move the location for initializing tmp_len	2018-05-23 15:45:44 -06:00
i40iw	RDMA/i40iw: Avoid panic when reading back the IRQ affinity hint	2018-05-09 10:45:19 -04:00
mlx4	IB/mlx4: Fix integer overflow when calculating optimal MTT size	2018-05-03 15:31:43 -04:00
mlx5	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
mthca	IB/uverbs: Extend uverbs_ioctl header with driver_id	2018-03-19 14:45:17 -06:00
nes	IB/nes: fix nes_netdev_start_xmit()'s return type	2018-04-27 14:07:30 -04:00
ocrdma	IB/providers: Avoid null netdev check for RoCE	2018-04-03 21:33:51 -06:00
qedr	RDMA/qedr: Fix doorbell bar mapping for dpi > 1	2018-05-23 15:12:14 -06:00
qib	RDMA: Use u64_to_user_ptr everywhere	2018-03-29 13:42:29 -06:00
usnic	Merge candidates for 4.17 merge window	2018-04-06 17:35:43 -07:00
vmw_pvrdma	RDMA: Use ib_gid_attr during GID modification	2018-04-03 21:34:16 -06:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00