linux-stable/drivers/infiniband/hw
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
cxgb3 cxgb3: Support ib_alloc_mr verb 2015-08-30 18:08:47 -04:00
cxgb4 IB/cxgb4: Fix if statement in pick_local_ip6adddrs 2015-09-03 14:03:59 -04:00
mlx4 Changes for 4.3 2015-09-09 08:33:31 -07:00
mlx5 IB/mlx5: Remove pa_lkey usages 2015-09-25 10:46:51 -04:00
mthca mlx4, mlx5, mthca: Expose max_sge_rd correctly 2015-08-28 23:02:10 -04:00
nes drivers/net: get rid of unnecessary initializations in .get_drvinfo() 2015-10-16 00:24:10 -07:00
ocrdma RDMA/ocrdma: Incorporate the moving of GID Table mgmt to IB/Core 2015-08-30 18:12:21 -04:00
qib mm: mark most vm_operations_struct const 2015-09-10 13:29:01 -07:00
usnic usnic: add missing clauses to BSD license 2015-10-06 13:43:25 -04:00
Makefile IB/ehca: Deprecate driver, move to staging, schedule deletion 2015-09-11 18:13:35 -04:00