]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge net-next/main to resolve conflicts
authorJohannes Berg <johannes.berg@intel.com>
Tue, 18 Mar 2025 08:45:23 +0000 (09:45 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 18 Mar 2025 08:46:36 +0000 (09:46 +0100)
commitc924c5e9b8c65b3a479a90e5e37d74cc8cd9fe0a
tree9626c13418dd3770f2772980a7dacdc110c442b6
parent54be64fdf3ba6dbad2f5c48e466e1db43ad74bca
parent50698b298b3995d253bd0b85ff7f60cae6f51e6a
Merge net-next/main to resolve conflicts

There are a few conflicts between the work that went
into wireless and that's here now, resolve them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/iwl-drv.c
drivers/net/wireless/intel/iwlwifi/iwl-trans.c
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
net/mac80211/mlme.c
net/wireless/core.c
net/wireless/nl80211.c
net/wireless/reg.c