David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
bnxt_re	RDMA/bnxt_re: Fix broken RoCE driver due to recent L2 driver changes	2018-05-25 11:03:47 -06:00
cxgb3	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
cxgb4	iw_cxgb4: correctly enforce the max reg_mr depth	2018-06-25 15:27:51 -06:00
hfi1	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
hns	treewide: Use array_size() in vzalloc()	2018-06-12 16:19:22 -07:00
i40iw	Merge branch 'mr_fix' into git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma for-next	2018-05-28 11:44:35 -06:00
mlx4	4.18-rc	2018-06-21 07:22:30 +09:00
mlx5	Regression, user visible bugs, and crashing fixes:	2018-07-13 12:42:14 -07:00
mthca	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
nes	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
ocrdma	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
qedr	4.18-rc	2018-06-21 07:22:30 +09:00
qib	treewide: Use array_size() in vzalloc()	2018-06-12 16:19:22 -07:00
usnic	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
vmw_pvrdma	RDMA: Use ib_gid_attr during GID modification	2018-04-03 21:34:16 -06:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00