David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The UDP offload conflict is dealt with by simply taking what is in net-next where we have removed all of the UFO handling code entirely. The TCP conflict was a case of local variables in a function being removed from both net and net-next. In netvsc we had an assignment right next to where a missing set of u64 stats sync object inits were added. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-09 16:28:45 -07:00
..
bnxt_re	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-01 10:07:50 -07:00
cxgb3	IB/cxgb3: Fix error codes in iwch_alloc_mr()	2017-07-20 11:20:49 -04:00
cxgb4	iw_cxgb4: don't use WR keys/addrs for 0 byte reads	2017-07-20 11:20:50 -04:00
hfi1	IB/{rdmavt, qib, hfi1}: Remove gfp flags argument	2017-07-17 21:21:23 -04:00
hns	IB/hns: checking for IS_ERR() instead of NULL	2017-08-04 15:09:56 -04:00
i40iw	IB/i40iw: Fix error code in i40iw_create_cq()	2017-07-20 11:20:49 -04:00
mlx4	IB/mlx4: Fix CM REQ retries in paravirt mode	2017-07-20 11:20:50 -04:00
mlx5	RDMA/mlx5: Fix existence check for extended address vector	2017-08-04 14:24:05 -04:00
mthca	IB/core: Define 'ib' and 'roce' rdma_ah_attr types	2017-05-01 14:32:43 -04:00
nes	IB: Convert msleep below 20ms to usleep_range	2017-07-17 21:21:22 -04:00
ocrdma	RDMA/ocrdma: Fix error codes in ocrdma_create_srq()	2017-07-20 11:20:49 -04:00
qedr	RDMA/qedr: Prevent memory overrun in verbs' user responses	2017-07-20 11:20:50 -04:00
qib	IB/{rdmavt, qib, hfi1}: Remove gfp flags argument	2017-07-17 21:21:23 -04:00
usnic	IB/core: Rename struct ib_ah_attr to rdma_ah_attr	2017-05-01 14:32:43 -04:00
vmw_pvrdma	IB/core: Define 'ib' and 'roce' rdma_ah_attr types	2017-05-01 14:32:43 -04:00
Makefile	RDMA/bnxt_re: Add bnxt_re driver build support	2017-02-14 09:51:28 -05:00