Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/phy/aquantia/aquantia.h 21934375 ("net: phy: aquantia: add missing include guards") 61578f67 ("net: phy: aquantia: add support for PHY LEDs") drivers/net/ethernet/wangxun/libwx/wx_hw.c bd07a981 ("net: txgbe: remove separate irq request for MSI and INTx") b501d261 ("net: txgbe: add FDIR ATR support") https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/ include/linux/mlx5/mlx5_ifc.h 048a4036 ("net/mlx5: IFC updates for changing max EQs") 99be5617 ("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 4130c67c ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference") 3f312651 ("wifi: iwlwifi: mvm: add mvm-specific guard") include/net/mac80211.h 816c6bec ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP") 5a009b42 ("wifi: mac80211: track changes in AP's TPE") Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Loading
Please register or sign in to comment