Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.12-rc6).

Conflicts:

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
  cbe84e9ad5e2 ("wifi: iwlwifi: mvm: really send iwl_txpower_constraints_cmd")
  188a1bf89432 ("wifi: mac80211: re-order assigning channel in activate links")
https://lore.kernel.org/all/20241028123621.7bbb131b@canb.auug.org.au/

net/mac80211/cfg.c
  c4382d5ca1af ("wifi: mac80211: update the right link for tx power")
  8dd0498983ee ("wifi: mac80211: Fix setting txpower with emulate_chanctx")

drivers/net/ethernet/intel/ice/ice_ptp_hw.h
  6e58c3310622 ("ice: fix crash on probe for DPLL enabled E810 LOM")
  e4291b64e118 ("ice: Align E810T GPIO to other products")
  ebb2693f8fbd ("ice: Read SDP section from NVM for pin definitions")
  ac532f4f4251 ("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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ptp_hw.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ptp_hw.h
index 656daff3447e7bf565ae5e3108c1f475045b82fb,6cedc1a906afb6f68408ccc28a65e8ef2b88f88b..47af7c5c79b8198839beac5f0900dafb8b5d44ed
--- 1/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
--- 2/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
+++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
@@@ -402,10 -400,11 +402,11 @@@ int ice_phy_cfg_rx_offset_e82x(struct i
  int ice_phy_cfg_intr_e82x(struct ice_hw *hw, u8 quad, bool ena, u8 threshold);
  
  /* E810 family functions */
 -int ice_read_sma_ctrl_e810t(struct ice_hw *hw, u8 *data);
 -int ice_write_sma_ctrl_e810t(struct ice_hw *hw, u8 data);
 -int ice_read_pca9575_reg_e810t(struct ice_hw *hw, u8 offset, u8 *data);
 -bool ice_is_pca9575_present(struct ice_hw *hw);
 +int ice_read_sma_ctrl(struct ice_hw *hw, u8 *data);
 +int ice_write_sma_ctrl(struct ice_hw *hw, u8 data);
 +int ice_read_pca9575_reg(struct ice_hw *hw, u8 offset, u8 *data);
 +int ice_ptp_read_sdp_ac(struct ice_hw *hw, __le16 *entries, uint *num_entries);
+ int ice_cgu_get_num_pins(struct ice_hw *hw, bool input);
  enum dpll_pin_type ice_cgu_get_pin_type(struct ice_hw *hw, u8 pin, bool input);
  struct dpll_pin_frequency *
  ice_cgu_get_pin_freq_supp(struct ice_hw *hw, u8 pin, bool input, u8 *num);

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
Simple merge

diff --cc drivers/net/wireless/intel/ipw2x00/ipw2100.c
Simple merge

diff --cc drivers/net/wireless/intel/ipw2x00/ipw2200.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/d3.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw88/usb.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/coex.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/pci.c
Simple merge

diff --cc drivers/net/wireless/virtual/mac80211_hwsim.c
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc include/net/ip_tunnels.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/mac80211/cfg.c
index 6c0b228523cb4e2c496c7fc10361e355fdd5b0d8,6dfc61a9acd4a57480e13eb81fad7a53215531d7..f11d7ed9e0e562e022bf794fe63150cfdf285ccb
--- 1/net/mac80211/cfg.c
--- 2/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@@ -3070,7 -3046,7 +3070,8 @@@ static int ieee80211_set_tx_power(struc
        enum nl80211_tx_power_setting txp_type = type;
        bool update_txp_type = false;
        bool has_monitor = false;
 +      int user_power_level;
+       int old_power = local->user_power_level;
  
        lockdep_assert_wiphy(local->hw.wiphy);
  

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/link.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/sched/cls_api.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/scan.c
Simple merge