| commit | dc0a7b52007145a85d0c2f3151870b101568b449 | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Fri Mar 24 09:53:54 2023 -0700 |
| committer | Jakub Kicinski <kuba@kernel.org> | Fri Mar 24 10:10:20 2023 -0700 |
| tree | ef53a994e39d47748b0a52a153a2207809881fec | |
| parent | 323fe43cf9aef79159ba8937218a3f076bf505af [diff] | |
| parent | 608f1b136616ff09d717776922c9ea9e9f9f3947 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
6e9d51b1a5cb ("net/mlx5e: Initialize link speed to zero")
1bffcea42926 ("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
323fe43cf9ae ("net: phy: Improved PHY error reporting in state machine")
4203d84032e2 ("net: phy: Ensure state transitions are processed from phy_stop()")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>