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
..
cpmac.c
cpsw_ale.c	net: ethernet: ti: ale: fix port check in cpsw_ale_control_set/get	2017-12-01 16:36:33 -05:00
cpsw_ale.h	net: ethernet: ti: ale: use devm_kzalloc in cpsw_ale_create()	2017-12-01 16:36:32 -05:00
cpsw-common.c	net: ti: cpsw-common: dont print error if ti_cm_get_macid() fails	2017-08-30 10:05:07 -07:00
cpsw-phy-sel.c
cpsw.c	net: ethernet: ti: cpdma: correct error handling for chan create	2017-12-13 15:49:53 -05:00
cpsw.h	net: ethernet: ti: cpsw: move mac_hi/lo defines in cpsw.h	2017-12-01 16:36:32 -05:00
cpts.c	net: ethernet: make ptp_clock_info const	2017-08-22 11:04:51 -07:00
cpts.h	net: ethernet: ti: cpts: fix tx timestamping timeout	2017-08-01 15:22:55 -07:00
davinci_cpdma.c	net: ethernet: ti: cpdma: correct error handling for chan create	2017-12-13 15:49:53 -05:00
davinci_cpdma.h
davinci_emac.c	net: ethernet: ti: cpdma: correct error handling for chan create	2017-12-13 15:49:53 -05:00
davinci_mdio.c	drivers: net: davinci_mdio: print bus frequency	2017-08-11 14:23:59 -07:00
Kconfig	cpsw/netcp: refine cpts dependency	2017-04-28 15:55:14 -04:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
netcp_core.c	Net: ethernet: ti: netcp: Fix inbound ping crash if MTU size is greater than 1500	2018-01-17 16:19:37 -05:00
netcp_ethss.c	net: ethernet: ti: ale: use devm_kzalloc in cpsw_ale_create()	2017-12-01 16:36:32 -05:00
netcp_sgmii.c
netcp_xgbepcsr.c
netcp.h
tlan.c	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
tlan.h