linux-kernel - Re: linux-next: manual merge of the wireless-next tree with the wireless tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20241031132403.7b5a0ca5@canb.auug.org.au>
Date: Thu, 31 Oct 2024 13:24:03 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>
Cc: Kalle Valo <kvalo@...nel.org>, Johannes Berg
 <johannes@...solutions.net>, Ben Greear <greearb@...delatech.com>, Emmanuel
 Grumbach <emmanuel.grumbach@...el.com>, Johannes Berg
 <johannes.berg@...el.com>, Wireless <linux-wireless@...r.kernel.org>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Miri Korenblit
 <miriam.rachel.korenblit@...el.com>, Networking <netdev@...r.kernel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with the
 wireless tree

Hi all,

On Thu, 24 Oct 2024 11:55:23 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped