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
..
core	IPoIB fixes for 4.13	2017-08-07 13:30:40 -04:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 16:28:45 -07:00
sw	rxe: fix broken receive queue draining	2017-07-20 11:20:50 -04:00
ulp	IB/ipoib: Notify on modify QP failure only when relevant	2017-07-23 10:52:00 +03:00
Kconfig	IB/opa-vnic: Virtual Network Interface Controller (VNIC) netdev	2017-04-20 12:01:38 -04:00
Makefile