Jakub Kicinski 76ed626479 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/phy/aquantia/aquantia.h 219343755e ("net: phy: aquantia: add missing include guards") 61578f6793 ("net: phy: aquantia: add support for PHY LEDs") drivers/net/ethernet/wangxun/libwx/wx_hw.c bd07a98178 ("net: txgbe: remove separate irq request for MSI and INTx") b501d261a5 ("net: txgbe: add FDIR ATR support") https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/ include/linux/mlx5/mlx5_ifc.h 048a403648 ("net/mlx5: IFC updates for changing max EQs") 99be56171f ("net/mlx5e: SHAMPO, Re-enable HW-GRO") https://lore.kernel.org/all/20240701133951.6926b2e3@canb.auug.org.au/ Adjacent changes: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 4130c67cd1 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference") 3f3126515f ("wifi: iwlwifi: mvm: add mvm-specific guard") include/net/mac80211.h 816c6bec09 ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP") 5a009b42e0 ("wifi: mac80211: track changes in AP's TPE") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-07-04 14:16:11 -07:00
..
libwx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-07-04 14:16:11 -07:00
ngbe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-07-04 14:16:11 -07:00
txgbe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-07-04 14:16:11 -07:00
Kconfig	wangxunx: select CONFIG_PHYLINK where needed	2024-01-11 16:26:36 -08:00
Makefile	net: txgbe: Store PCI info	2022-10-28 11:25:53 +01:00