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
..
peak_usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
ems_usb.c	can: ems_usb: improve error reporting for error warning and error passive	2018-01-04 16:14:38 +01:00
esd_usb2.c	can: esd_usb2: cancel urb on -EPIPE and -EPROTO	2017-12-08 10:45:11 +01:00
gs_usb.c	linux-can-next-for-4.16-20180105	2018-01-15 16:13:34 -05:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-26 22:39:08 -04:00
kvaser_usb.c	can: kvaser_usb: cancel urb on -EPIPE and -EPROTO	2017-12-08 10:45:11 +01:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mcba_usb.c	can: mcba_usb: cancel urb on -EPROTO	2017-12-08 10:45:11 +01:00
usb_8dev.c	can: usb_8dev: cancel urb on -EPIPE and -EPROTO	2017-12-08 10:45:11 +01:00