+148
−159
Loading
Cross-merge networking fixes after downstream PR (net-6.12-rc6). Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c cbe84e9a ("wifi: iwlwifi: mvm: really send iwl_txpower_constraints_cmd") 188a1bf8 ("wifi: mac80211: re-order assigning channel in activate links") https://lore.kernel.org/all/20241028123621.7bbb131b@canb.auug.org.au/ net/mac80211/cfg.c c4382d5c ("wifi: mac80211: update the right link for tx power") 8dd04989 ("wifi: mac80211: Fix setting txpower with emulate_chanctx") drivers/net/ethernet/intel/ice/ice_ptp_hw.h 6e58c331 ("ice: fix crash on probe for DPLL enabled E810 LOM") e4291b64 ("ice: Align E810T GPIO to other products") ebb2693f ("ice: Read SDP section from NVM for pin definitions") ac532f4f ("ice: Cleanup unused declarations") https://lore.kernel.org/all/20241030120524.1ee1af18@canb.auug.org.au/ No adjacent changes. Signed-off-by:Jakub Kicinski <kuba@kernel.org>