David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c, we had some overlapping changes: 1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE --> MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE 2) In 'net-next' params->log_rq_size is renamed to be params->log_rq_mtu_frames. 3) In 'net-next' params->hard_mtu is added. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-01 19:49:34 -04:00
..
bnxt_re	infiniband: bnxt_re: use BIT_ULL() for 64-bit bit masks	2018-03-14 18:24:13 -04:00
cxgb3
cxgb4	cxgb4: notify fatal error to uld drivers	2018-03-16 14:46:57 -04:00
hfi1	treewide: remove large struct-pass-by-value from tracepoint arguments	2018-03-28 22:55:18 +02:00
hns	RDMA/hns: ensure for-loop actually iterates and free's buffers	2018-03-27 15:06:34 -06:00
i40iw	i40iw: Free IEQ resources	2018-01-16 20:38:18 -07:00
mlx4	IB/mlx4: Include GID type when deleting GIDs from HW table under RoCE	2018-03-06 20:08:38 -07:00
mlx5	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
mthca	IB/mthca: remove mthca_user.h	2018-01-28 14:07:16 -07:00
nes
ocrdma	IB/ocrdma: Use zeroing memory allocator than allocator/memset	2018-01-02 11:20:13 -07:00
qedr	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
qib	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
usnic	infiniband: Replace usnic_ib_netdev_event_to_string() with netdev_cmd_to_name()	2018-03-26 11:34:00 -04:00
vmw_pvrdma	RDMA/vmw_pvrdma: Fix usage of user response structures in ABI file	2018-02-15 15:31:28 -07:00
Makefile