Message ID | 20241024115523.4cd35dde@canb.auug.org.au (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Johannes Berg |
Headers | show |
Series | linux-next: manual merge of the wireless-next tree with the wireless tree | expand |
Hi Stephen, > Today's linux-next merge of the wireless-next tree got a conflict in: > > net/mac80211/cfg.c > > between commit: > > 8dd0498983ee ("wifi: mac80211: Fix setting txpower with emulate_chanctx") > > from the wireless tree and commit: > > c4382d5ca1af ("wifi: mac80211: update the right link for tx power") > > from the wireless-next tree. Yeah, I'm aware, we need to flush our trees. > I fixed it up (see below) Looks good, thanks :) johannes
diff --cc net/mac80211/cfg.c index 6dfc61a9acd4,6c0b228523cb..000000000000 --- a/net/mac80211/cfg.c