linux-stable/drivers/net/ethernet/mscc
Jakub Kicinski dc0a7b5200 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
  6e9d51b1a5 ("net/mlx5e: Initialize link speed to zero")
  1bffcea429 ("net/mlx5e: Add devlink hairpin queues parameters")
https://lore.kernel.org/all/20230324120623.4ebbc66f@canb.auug.org.au/
https://lore.kernel.org/all/20230321211135.47711-1-saeed@kernel.org/

Adjacent changes:

drivers/net/phy/phy.c
  323fe43cf9 ("net: phy: Improved PHY error reporting in state machine")
  4203d84032 ("net: phy: Ensure state transitions are processed from phy_stop()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-03-24 10:10:20 -07:00
..
Kconfig net: dsa: ocelot: add PTP dependency for NET_DSA_MSCC_OCELOT_EXT 2023-02-10 19:35:58 -08:00
Makefile net: mscc: ocelot: add MAC Merge layer support for VSC9959 2023-01-23 12:44:18 +00:00
ocelot.c net: mscc: ocelot: expose serdes configuration function 2023-03-20 09:08:48 +00:00
ocelot.h net: mscc: ocelot: add MAC Merge layer support for VSC9959 2023-01-23 12:44:18 +00:00
ocelot_devlink.c net: mscc: ocelot: expose ocelot wm functions 2023-01-30 21:07:20 -08:00
ocelot_fdma.c net: ocelot: fix wrong time_after usage 2022-07-07 18:05:36 -07:00
ocelot_fdma.h net: ocelot: add FDMA support 2021-12-10 20:56:58 -08:00
ocelot_flower.c net: mscc: ocelot: fix VCAP filters not matching on MAC with "protocol 802.1Q" 2023-02-07 12:20:21 +01:00
ocelot_io.c net: mscc: ocelot: add ability to perform bulk reads 2022-02-14 13:24:29 +00:00
ocelot_mm.c net: mscc: ocelot: fix incorrect verify_enabled reporting in ethtool get_mm() 2023-01-24 18:34:20 -08:00
ocelot_mrp.c net: mscc: ocelot: enforce FDB isolation when VLAN-unaware 2022-02-27 11:06:14 +00:00
ocelot_net.c net: mscc: ocelot: expose serdes configuration function 2023-03-20 09:08:48 +00:00
ocelot_police.c net: mscc: ocelot: drop port argument from qos_policer_conf_set 2022-05-04 20:42:15 -07:00
ocelot_police.h net: mscc: ocelot: drop port argument from qos_policer_conf_set 2022-05-04 20:42:15 -07:00
ocelot_ptp.c net: mscc: ocelot: fix all IPv6 getting trapped to CPU when PTP timestamping is used 2023-02-09 10:52:44 +01:00
ocelot_qs.h
ocelot_rew.h
ocelot_stats.c net: mscc: ocelot: add TX_MM_HOLD to ocelot_mm_stats_layout 2023-03-21 21:28:07 -07:00
ocelot_vcap.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2022-05-12 16:15:30 -07:00
ocelot_vcap.h
ocelot_vsc7514.c net: mscc: ocelot: expose ocelot_pll5_init routine 2023-03-20 09:08:48 +00:00
vsc7514_regs.c net: mscc: ocelot: un-export unused regmap symbols 2023-02-06 22:33:15 -08:00