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
..
ehea	net: Convert to using %pOF instead of full_name	2017-07-24 13:41:48 -07:00
emac	net: Convert to using %pOF instead of full_name	2017-07-24 13:41:48 -07:00
Kconfig	Driver for IBM System i/p VNIC protocol	2015-12-28 00:12:13 -05:00
Makefile	Driver for IBM System i/p VNIC protocol	2015-12-28 00:12:13 -05:00
ibmveth.c	This is the first pull request for the new dma-mapping subsystem	2017-07-06 19:20:54 -07:00
ibmveth.h	ibmveth: Support to enable LSO/CSO for Trunk VEA.	2017-05-21 13:29:01 -04:00
ibmvnic.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 16:28:45 -07:00
ibmvnic.h	ibmvnic: Implement per-queue statistics reporting	2017-08-03 09:33:05 -07:00