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
..
appletalk
arcnet
bonding
caif
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
cris
dsa	net: dsa: mv88e6xxx: Free ATU/VTU irq only when there is chip irq	2018-01-19 15:57:02 -05:00
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
fddi
fjes
hamradio
hippi
hyperv
ieee802154
ipvlan
netdevsim
phy	phy: realtek: use new helpers for paged register access	2018-01-16 13:56:33 -05:00
plip
ppp	ppp: unlock all_ppp_mutex before registering device	2018-01-15 13:22:03 -05:00
slip
team
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
vmxnet3
wan
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
xen-netback
dummy.c
eql.c
geneve.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-09 10:37:00 -05:00
gtp.c
ifb.c
Kconfig
LICENSE.SRC
loopback.c
macsec.c	macsec: Add support for GCM-AES-256 cipher suite	2018-01-09 11:34:18 -05:00
macvlan.c
macvtap.c
Makefile
mdio.c
mii.c
netconsole.c
nlmon.c
ntb_netdev.c
rionet.c
sb1000.c
Space.c
sungem_phy.c
tap.c	tun/tap: use ptr_ring instead of skb_array	2018-01-09 10:56:10 -05:00
thunderbolt.c
tun.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
veth.c
virtio_net.c	virtio_net: propagate linkspeed/duplex settings from the hypervisor	2018-01-09 11:37:56 -05:00
vrf.c
vsockmon.c
vxlan.c
xen-netfront.c