David S. Miller 3793faad7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Conflicts were all overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2020-05-06 22:10:13 -07:00

..

Kconfig

net: mscc: ocelot: make use of SerDes PHYs for handling their configuration

2018-10-05 14:36:44 -07:00

Makefile

net: mscc: ocelot: move ocelot ptp clock code out of ocelot.c

2020-04-21 15:38:33 -07:00

ocelot_ace.c

net: mscc: ocelot: refine the ocelot_ace_is_problematic_mac_etype function

2020-04-22 11:40:51 -07:00

ocelot_ace.h

net: mscc: ocelot: deal with problematic MAC_ETYPE VCAP IS2 rules

2020-04-18 15:54:11 -07:00

ocelot_board.c

net: mscc: ocelot: enable PTP programmable pin

2020-04-21 15:38:34 -07:00

ocelot_flower.c

net: mscc: ocelot: lift protocol restriction for flow_match_eth_addrs keys

2020-04-22 11:40:51 -07:00

ocelot_io.c

net: mscc: ocelot: move resource ioremap and regmap init to common code

2019-11-15 12:32:16 -08:00

ocelot_police.c

net: dsa: felix: add port policers

2020-03-30 11:44:00 -07:00

ocelot_police.h

net: dsa: felix: add port policers

2020-03-30 11:44:00 -07:00

ocelot_ptp.c

net: mscc: ocelot: support 4 PTP programmable pins

2020-04-21 15:38:33 -07:00

ocelot_qs.h

…

ocelot_regs.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-05-06 22:10:13 -07:00

ocelot_rew.h

…

ocelot_s2.h

net: mscc: ocelot: Add support for tcam

2019-06-02 13:49:49 -07:00

ocelot_tc.c

net: dsa: felix: add port policers

2020-03-30 11:44:00 -07:00

ocelot_tc.h

net: mscc: ocelot: Implement port policers via tc command

2019-05-29 21:37:49 -07:00

ocelot.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-05-06 22:10:13 -07:00

ocelot.h

net: mscc: ocelot: move ocelot ptp clock code out of ocelot.c

2020-04-21 15:38:33 -07:00