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
..
defines.h	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ethtool.c	net: ethernet: move from strlcpy with unused retval to strscpy	2022-08-31 14:11:26 -07:00
igbvf.h	intel/igbvf:fix repeated words in comments	2022-06-30 11:04:14 -07:00
Makefile	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
mbx.c	igbvf: Replace spin_is_locked() with lockdep	2018-11-07 09:47:00 -08:00
mbx.h	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
netdev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-03-24 10:10:20 -07:00
regs.h	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
vf.c	igbvf: Regard vf reset nack as success	2023-03-16 08:55:56 -07:00
vf.h	igbvf: convert to strongly typed descriptors	2021-05-26 09:11:41 -07:00