Jakub Kicinski 5b1c965956 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
  cbe84e9ad5 ("wifi: iwlwifi: mvm: really send iwl_txpower_constraints_cmd")
  188a1bf894 ("wifi: mac80211: re-order assigning channel in activate links")
https://lore.kernel.org/all/20241028123621.7bbb131b@canb.auug.org.au/

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

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

2024-10-31 18:10:07 -07:00

..

Kconfig

wifi: move mac80211_hwsim and virt_wifi to virtual directory

2023-03-13 15:42:14 +02:00

mac80211_hwsim.c

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

2024-10-31 18:10:07 -07:00

mac80211_hwsim.h

wifi: mac80211_hwsim: add support for multi-radio wiphy

2024-07-09 11:36:12 +02:00

Makefile

wifi: move mac80211_hwsim and virt_wifi to virtual directory

2023-03-13 15:42:14 +02:00

virt_wifi.c

wifi: virt_wifi: don't use strlen() in const context

2024-07-09 08:49:56 +02:00