David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05:00
..
cxgb3	RDMA/core: Add the function ib_mtu_int_to_enum	2017-01-24 15:34:22 -05:00
cxgb4	RDMA/core: Add the function ib_mtu_int_to_enum	2017-01-24 15:34:22 -05:00
hfi1	Updates for 4.10 kernel merge window	2016-12-15 12:03:32 -08:00
hns	Merge branch 'mlx' into merge-test	2016-12-14 14:44:25 -05:00
i40iw	RDMA/core: Add the function ib_mtu_int_to_enum	2017-01-24 15:34:22 -05:00
mlx4	net/mlx4_core: Fix raw qp flow steering rules under SRIOV	2016-12-29 14:17:40 -05:00
mlx5	IB/mlx5: Enable Eth VFs to query their min-inline value for user-space	2017-01-24 21:14:06 +02:00
mthca	Merge branch 'mlx' into merge-test	2016-12-14 14:44:25 -05:00
nes	RDMA/core: Add the function ib_mtu_int_to_enum	2017-01-24 15:34:22 -05:00
ocrdma	Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test	2016-12-14 14:44:47 -05:00
qedr	RDMA/qedr: Dispatch port active event from qedr_add	2017-01-24 15:35:08 -05:00
qib	Merge branch 'hfi1' into merge-test	2016-12-14 14:44:08 -05:00
usnic	Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test	2016-12-14 14:44:47 -05:00
vmw_pvrdma	IB/vmw_pvrdma: Fix incorrect cleanup on pvrdma_pci_probe error path	2017-01-24 14:15:28 -05:00
Makefile	IB: Add vmw_pvrdma driver	2016-12-14 14:55:10 -05:00