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
..
Kconfig	infiniband: mlx5: fix build errors when INFINIBAND_USER_ACCESS=m	2018-04-17 19:26:43 -06:00
Makefile	IB/mlx5: Add basic regiser/unregister representors code	2018-02-23 12:36:39 -08:00
ah.c	IB/mlx5: Enable ECN capable bits for UD RoCE v2 QPs	2018-03-27 14:43:10 -06:00
cmd.c	net/mlx5: Mkey creation command adjustments	2018-04-05 13:04:49 -06:00
cmd.h	IB/mlx5: Device memory support in mlx5_ib	2018-04-05 13:04:49 -06:00
cong.c	IB/mlx5: Change debugfs to have per port contents	2018-01-08 11:42:22 -07:00
cq.c	IB/mlx5: Use 'kvfree()' for memory allocated by 'kvzalloc()'	2018-05-16 17:50:19 -07:00
doorbell.c	IB/mlx5: Fix Mellanox copyright note	2015-04-02 16:33:42 -04:00
gsi.c	IB/mlx5: Fix iteration overrun in GSI qps	2016-08-02 14:32:51 -04:00
ib_rep.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-23 11:31:58 -04:00
ib_rep.h	IB/mlx5: Add proper representors support	2018-02-23 12:36:39 -08:00
ib_virt.c	IB/mlx5: Restore IB guid/policy for virtual functions	2017-07-24 10:34:28 -04:00
mad.c	IB/mlx5: Route MADs for dual port RoCE	2018-01-08 11:42:23 -07:00
main.c	Merge candidates for 4.17-rc	2018-05-24 14:12:05 -07:00
mem.c	IB/mlx5: Simplify mlx5_ib_cont_pages	2017-09-25 11:47:24 -04:00
mlx5_ib.h	IB/mlx5: Device memory mr registration support	2018-04-05 13:04:49 -06:00
mr.c	RDMA/mlx5: Fix multiple NULL-ptr deref errors in rereg_mr flow	2018-04-27 11:03:15 -04:00
odp.c	IB/mlx5: Move locks initialization to the corresponding stage	2018-01-03 17:26:59 -07:00
qp.c	RDMA/mlx5: Don't assume that medium blueFlame register exists	2018-05-09 10:39:50 -04:00
srq.c	IB/mlx5: Fix integer overflows in mlx5_ib_create_srq	2018-03-13 16:31:21 -04:00