David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
dsa2.c	net: dsa: introduce a dsa_switch_find function	2020-05-10 19:52:33 -07:00
dsa_priv.h	net: dsa: provide an option for drivers to always receive bridge VLANs	2020-05-12 13:08:07 -07:00
dsa.c	net: dsa: introduce a dsa_port_from_netdev public helper	2020-05-07 17:31:57 -07:00
Kconfig	net: dsa: add GRO support via gro_cells	2020-04-23 12:32:13 -07:00
Makefile	net: dsa: add support for Atheros AR9331 TAG format	2019-12-20 17:05:47 -08:00
master.c	net: dsa: Do not leave DSA master with NULL netdev_ops	2020-05-06 17:31:54 -07:00
port.c	net: dsa: provide an option for drivers to always receive bridge VLANs	2020-05-12 13:08:07 -07:00
slave.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
switch.c	net: dsa: permit cross-chip bridging between all trees in the system	2020-05-10 19:52:33 -07:00
tag_8021q.c	net: dsa: tag_8021q: stop restoring VLANs from bridge	2020-05-29 16:45:46 -07:00
tag_ar9331.c	net: dsa: tag_ar9331: Make sure there is headroom for tag	2020-02-14 07:34:51 -08:00
tag_brcm.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-25 18:58:11 -07:00
tag_dsa.c	dsa: Cleanup unneeded table and make tag structures static	2019-04-28 19:41:01 -04:00
tag_edsa.c	dsa: Cleanup unneeded table and make tag structures static	2019-04-28 19:41:01 -04:00
tag_gswip.c	net: dsa: tag_gswip: fix typo in tagger name	2020-01-16 13:58:26 +01:00
tag_ksz.c	net: dsa: ksz: use common define for tag len	2019-12-20 21:06:49 -08:00
tag_lan9303.c	dsa: Cleanup unneeded table and make tag structures static	2019-04-28 19:41:01 -04:00
tag_mtk.c	net: dsa: mt7530: fix roaming from DSA user ports	2020-05-16 13:49:28 -07:00
tag_ocelot.c	net: dsa: ocelot: Constify dsa_device_ops	2020-05-11 16:50:45 -07:00
tag_qca.c	net: dsa: tag_qca: Make sure there is headroom for tag	2020-02-14 07:34:51 -08:00
tag_sja1105.c	net: dsa: tag_sja1105: appease sparse checks for ethertype accessors	2020-05-12 18:02:42 -07:00
tag_trailer.c	dsa: Cleanup unneeded table and make tag structures static	2019-04-28 19:41:01 -04:00