Hi all,
On Thu, 24 Oct 2024 11:55:23 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc net/mac80211/cfg.c
> index 6dfc61a9acd4,6c0b228523cb..000000000000
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@@ -3046,7 -3070,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 old_power = local->user_power_level;
> + int user_power_level;
>
> lockdep_assert_wiphy(local->hw.wiphy);
This is now a conflict between the net and net-next trees.
--
Cheers,
Stephen Rothwell
Attachment:
pgpsZiesKcXSN.pgp
Description: OpenPGP digital signature
