Jakub Kicinski 9d49aea13f Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Small conflict around locking in rxrpc_process_event() - channel_lock moved to bundle in next, while state lock needs _bh() from net. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-10-08 15:44:50 -07:00
..
Kconfig	net: mscc: ocelot: rethink Kconfig dependencies again	2020-07-16 12:46:00 -07:00
Makefile	net: mscc: ocelot: rename ocelot_ace.{c, h} to ocelot_vcap.{c,h}	2020-06-20 17:25:23 -07:00
ocelot.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-08 15:44:50 -07:00
ocelot.h	net: mscc: ocelot: introduce conversion helpers between port and netdev	2020-10-02 15:40:30 -07:00
ocelot_flower.c	net: mscc: ocelot: offload redirect action to VCAP IS2	2020-10-02 15:40:30 -07:00
ocelot_io.c	net: mscc: ocelot: introduce a new ocelot_target_{read,write} API	2020-09-29 18:26:12 -07:00
ocelot_net.c	net: dsa: propagate switchdev vlan_filtering prepare phase to drivers	2020-10-05 05:56:48 -07:00
ocelot_police.c	net: mscc: ocelot: move net_device related functions to ocelot_net.c	2020-06-20 17:25:23 -07:00
ocelot_police.h	net: mscc: ocelot: unexpose ocelot_vcap_policer_{add,del}	2020-06-20 17:25:23 -07:00
ocelot_ptp.c	net: mscc: ocelot: make ocelot_init_timestamp take a const struct ptp_clock_info	2020-09-18 17:52:40 -07:00
ocelot_qs.h
ocelot_rew.h
ocelot_vcap.c	net: mscc: ocelot: relax ocelot_exclusive_mac_etype_filter_rules()	2020-10-02 15:40:30 -07:00
ocelot_vcap.h	net: mscc: ocelot: offload egress VLAN rewriting to VCAP ES0	2020-10-02 15:40:30 -07:00
ocelot_vsc7514.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-08 15:44:50 -07:00