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
..
af_can.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-19 22:59:33 -05:00
af_can.h	can: af_can: give struct holding the CAN per device receive lists a sensible name	2018-01-05 11:12:08 +01:00
bcm.c	net: delete /proc THIS_MODULE references	2018-01-16 15:01:33 -05:00
gw.c	net: use rtnl_register_module where needed	2017-12-04 11:32:39 -05:00
Kconfig	can: Kconfig: switch on all CAN protocolls by default	2013-01-26 16:58:58 +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
proc.c	net: delete /proc THIS_MODULE references	2018-01-16 15:01:33 -05:00
raw.c	can: raw: raw_bind(): bail out if can_family is not AF_CAN	2018-01-05 11:12:08 +01:00