David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The BPF verifier conflict was some minor contextual issue. The TUN conflict was less trivial. Cong Wang fixed a memory leak of tfile->tx_array in 'net'. This is an skb_array. But meanwhile in net-next tun changed tfile->tx_arry into tfile->tx_ring which is a ptr_ring. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-19 22:59:33 -05:00
..
ehea	net: Convert to using %pOF instead of full_name	2017-07-24 13:41:48 -07:00
emac	net: ibm: emac: support RGMII-[RX|TX]ID phymode	2017-12-21 13:09:41 -05:00
ibmveth.c	net: ibm: ibmveth: constify vio_device_id	2017-08-17 10:17:31 -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	2018-01-19 22:59:33 -05:00
ibmvnic.h	ibmvnic: Increase maximum number of RX/TX queues	2017-12-19 14:08:20 -05: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