2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00
linux-next/drivers/infiniband/hw/mlx5
David S. Miller cba6532100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-04 00:52:29 -04:00
..
ah.c IB/mlx5: Add RoCE fields to Address Vector 2015-12-23 12:07:37 -05:00
cq.c net/mlx5: Refactor mlx5_core_mr to mkey 2016-03-01 11:18:37 -05:00
doorbell.c IB/mlx5: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
gsi.c IB/mlx5: Eliminate GSI RX QP's send buffers 2016-03-01 11:04:07 -05:00
ib_virt.c IB/mlx5: Implement callbacks for manipulating VFs 2016-03-21 17:13:14 -04:00
Kconfig net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality 2015-05-30 18:24:51 -07:00
mad.c net/mlx5_core: Add VF param when querying vport counter 2016-03-21 17:13:14 -04:00
main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
Makefile IB/mlx5: Implement callbacks for manipulating VFs 2016-03-21 17:13:14 -04:00
mem.c IB/mlx5: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
mlx5_ib.h IB/mlx5: fix VFs callback function prototypes 2016-04-06 10:37:07 -04:00
mr.c mlx5: Add arbitrary sg list support 2016-03-04 11:59:35 -05:00
odp.c net/mlx5: Refactor mlx5_core_mr to mkey 2016-03-01 11:18:37 -05:00
qp.c mlx5: Add arbitrary sg list support 2016-03-04 11:59:35 -05:00
srq.c IB/{core, mlx5}: Fix input len in vendor part of create_qp/srq 2016-03-03 10:00:18 -05:00
user.h IB/mlx5: Add memory windows allocation support 2016-03-01 11:18:54 -05:00