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
..
e1000_82575.c	igb: remove unexpected word "the"	2022-06-30 10:43:18 -07:00
e1000_82575.h
e1000_defines.h	igb: Remove duplicate defines	2022-06-09 10:05:31 -07:00
e1000_hw.h
e1000_i210.c
e1000_i210.h
e1000_mac.c	intel/igb:fix repeated words in comments	2022-06-30 11:02:36 -07:00
e1000_mac.h
e1000_mbx.c
e1000_mbx.h
e1000_nvm.c
e1000_nvm.h
e1000_phy.c
e1000_phy.h
e1000_regs.h	igb: Remove duplicate defines	2022-06-09 10:05:31 -07:00
igb_ethtool.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-12-08 18:19:59 -08:00
igb_hwmon.c
igb_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-03-24 10:10:20 -07:00
igb_ptp.c	igb: refactor igb_ptp_adjfine_82580 to use diff_by_scaled_ppm	2023-03-21 11:37:16 -07:00
igb.h	igb: Add lock to avoid data race	2022-08-18 11:03:26 -07:00
Makefile