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
..
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-03-24 10:10:20 -07:00
cli.py	ynl: re-license uniformly under GPL-2.0 OR BSD-3-Clause	2023-03-07 13:44:30 -08:00
ynl-gen-c.py	tools: ynl: skip the explicit op array size when not needed	2023-03-21 21:45:31 -07:00
ynl-regen.sh	ynl: re-license uniformly under GPL-2.0 OR BSD-3-Clause	2023-03-07 13:44:30 -08:00