linux-stable/drivers/net/ethernet/freescale
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
..
dpaa drivers: net: turn on XDP features 2023-02-02 20:48:23 -08:00
dpaa2 net: dpaa2-mac: use Autoneg bit rather than an_enabled 2023-03-22 22:43:05 -07:00
enetc net: enetc: fix aggregate RMON counters not showing the ranges 2023-03-22 20:39:10 -07:00
fman phy-for-6.3 2023-02-24 17:22:11 -08:00
fs_enet net: ethernet: remove fs_mii_disconnect and fs_mii_connect declarations 2022-09-19 14:08:14 -07:00
fec.h net: fec: add xdp and page pool statistics 2022-11-14 11:28:55 +00:00
fec_main.c net: Use of_property_read_bool() for boolean properties 2023-03-16 17:41:28 +00:00
fec_mpc52xx.c net: Use of_property_read_bool() for boolean properties 2023-03-16 17:41:28 +00:00
fec_mpc52xx.h
fec_mpc52xx_phy.c powerpc/mpc5xxx: Switch mpc5xxx_get_bus_frequency() to use fwnode 2022-06-22 12:51:49 +10:00
fec_ptp.c ptp: convert remaining drivers to adjfine interface 2022-11-11 10:58:39 +00:00
fsl_pq_mdio.c
gianfar.c net: Use of_property_read_bool() for boolean properties 2023-03-16 17:41:28 +00:00
gianfar.h eth: gfar: remove a copy of the NAPI_POLL_WEIGHT define 2022-04-29 11:56:42 +01:00
gianfar_ethtool.c net: ethernet: move from strlcpy with unused retval to strscpy 2022-08-31 14:11:26 -07:00
Kconfig net: fec: add xdp and page pool statistics 2022-11-14 11:28:55 +00:00
Makefile
ucc_geth.c net: drop the weight argument from netif_napi_add 2022-09-28 18:57:14 -07:00
ucc_geth.h
ucc_geth_ethtool.c net: ethernet: move from strlcpy with unused retval to strscpy 2022-08-31 14:11:26 -07:00
xgmac_mdio.c net: phy: Remove probe_capabilities 2023-01-19 16:23:19 +01:00