]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 1 Nov 2024 00:30:16 +0000 (17:30 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 1 Nov 2024 01:10:07 +0000 (18:10 -0700)
commit5b1c965956744d9b22fae7e9bca1c8e72355e1d0
tree504f731de0a7ac9111de5c106cd360e4ff1c04af
parent9e114ec8084020e10e1cb7b43dbbf6e69940866b
parent5635f189425e328097714c38341944fc40731f3d
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>
26 files changed:
MAINTAINERS
drivers/net/ethernet/intel/ice/ice_ptp_hw.c
drivers/net/ethernet/intel/ice/ice_ptp_hw.h
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
drivers/net/wireless/intel/ipw2x00/ipw2100.c
drivers/net/wireless/intel/ipw2x00/ipw2200.h
drivers/net/wireless/intel/iwlwifi/mvm/d3.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
drivers/net/wireless/realtek/rtw88/usb.c
drivers/net/wireless/realtek/rtw89/coex.c
drivers/net/wireless/realtek/rtw89/pci.c
drivers/net/wireless/virtual/mac80211_hwsim.c
include/net/cfg80211.h
include/net/ip_tunnels.h
net/core/dev.c
net/core/filter.c
net/core/rtnetlink.c
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/link.c
net/mptcp/protocol.c
net/sched/cls_api.c
net/sched/sch_api.c
net/wireless/core.c
net/wireless/scan.c