David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
dsa2.c	net: dsa: Remove VLA usage	2018-07-18 15:08:31 -07:00
dsa_priv.h	net: dsa: Plug in PHYLINK support	2018-05-11 12:03:06 -04:00
dsa.c	net: dsa: forward timestamping callbacks to switch drivers	2018-02-14 14:33:37 -05:00
Kconfig	net: dsa: Add PHYLINK switch operations	2018-05-11 12:03:05 -04:00
legacy.c	net: dsa: Fix dsa_is_user_port() test inversion	2018-03-12 21:04:55 -04:00
Makefile	net: dsa: Allow compiling out legacy support	2017-12-07 14:14:54 -05:00
master.c	net: dsa: Allow providing PHY statistics from CPU port	2018-04-27 11:53:03 -04:00
port.c	dsa: port: Ignore bridge VLAN events	2018-05-31 14:13:43 -04:00
slave.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
switch.c	net: dsa: Remove VLA usage	2018-07-18 15:08:31 -07:00
tag_brcm.c	net: dsa: Move padding into Broadcom tagger	2018-01-05 11:21:31 -05:00
tag_dsa.c	net: dsa: {e}dsa: set offload_fwd_mark on received packets	2017-11-11 19:33:11 +09:00
tag_edsa.c	net: dsa: {e}dsa: set offload_fwd_mark on received packets	2017-11-11 19:33:11 +09:00
tag_ksz.c	net: dsa: rename dsa_master_get_slave	2017-10-18 12:24:33 +01:00
tag_lan9303.c	net: dsa: lan9303: calculate offload_fwd_mark from tag	2017-11-14 21:47:48 +09:00
tag_mtk.c	net: dsa: mediatek: combine MediaTek tag with VLAN tag	2017-12-15 10:31:54 -05:00
tag_qca.c	net: dsa: rename dsa_master_get_slave	2017-10-18 12:24:33 +01:00
tag_trailer.c	net: dsa: add error handling for pskb_trim_rcsum	2018-06-11 14:19:38 -07:00