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
..
alloc.c
catas.c	net/mlx4: Lock mlx4 devlink reload callback	2022-07-28 21:58:47 -07:00
cmd.c	net: mellanox: fix open-coded for_each_set_bit()	2022-05-02 06:30:39 -07:00
cq.c
crdump.c	net/mlx4: Use devl_ API for devlink region create / destroy	2022-07-28 21:58:46 -07:00
en_clock.c	net/mlx4_en: Support RX XDP metadata	2023-01-23 09:58:23 -08:00
en_cq.c	net: drop the weight argument from netif_napi_add	2022-09-28 18:57:14 -07:00
en_dcb_nl.c
en_ethtool.c	net: ethernet: move from strlcpy with unused retval to strscpy	2022-08-31 14:11:26 -07:00
en_main.c
en_netdev.c	drivers: net: turn on XDP features	2023-02-02 20:48:23 -08:00
en_port.c
en_port.h
en_resources.c
en_rx.c	xdp: bpf_xdp_metadata use EOPNOTSUPP for no driver support	2023-03-22 09:11:09 -07:00
en_selftest.c
en_tx.c	net/mlx4_en: Introduce flexible array to silence overflow warning	2023-02-20 16:38:00 -08:00
eq.c
fw.c	net: ethernet: move from strlcpy with unused retval to strscpy	2022-08-31 14:11:26 -07:00
fw.h
fw_qos.c
fw_qos.h
icm.c	net/mlx4: Fix error check for dma_map_sg	2022-08-26 17:29:50 -07:00
icm.h
intf.c
Kconfig
main.c	devlink: remove devlink features	2023-01-30 08:37:46 +00:00
Makefile
mcg.c
mlx4.h
mlx4_en.h	net/mlx4_en: Replace fake flex-array with flexible-array member	2023-03-08 09:53:49 +00:00
mlx4_stats.h
mr.c
pd.c
port.c
profile.c
qp.c	RDMA/mlx: Calling qp event handler in workqueue context	2023-01-15 12:23:10 +02:00
reset.c
resource_tracker.c
sense.c
srq.c