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
..
netxen	netxen_nic: Remove unused pointer hdr in netxen_setup_minidump()	2017-07-03 02:38:02 -07:00
qed	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 16:28:45 -07:00
qede	qed: Read per queue coalesce from hardware	2017-07-27 00:05:22 -07:00
qlcnic	qlcnic: add const to bin_attribute structure	2017-08-03 09:28:51 -07:00
qlge	networking: introduce and use skb_put_data()	2017-06-16 11:48:37 -04:00
Kconfig	qed: Add support for hardware offloaded FCoE.	2017-02-19 18:10:42 -05:00
Makefile	qede: Add basic Network driver	2015-10-27 19:34:47 -07:00
qla3xxx.c	net: qlogic: qla3xxx: use new api ethtool_{get|set}_link_ksettings	2017-02-20 10:27:17 -05:00
qla3xxx.h