Subject: Re: linux-next: manual merge of the ath-next tree with the ath tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 6 Nov 2025 11:56:36 +1100

Hi all,

On Thu, 30 Oct 2025 11:30:37 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the ath-next tree got a conflict in:
> 
>   drivers/net/wireless/ath/ath12k/mac.c
> 
> between commit:
> 
>   9222582ec524 ("Revert "wifi: ath12k: Fix missing station power save configuration"")
> 
> from the ath tree and commit:
> 
>   6917e268c433 ("wifi: ath12k: Defer vdev bring-up until CSA finalize to avoid stale beacon")
> 
> from the ath-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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/net/wireless/ath/ath12k/mac.c
> index db351c922018,e79d457e3c03..000000000000
> --- a/drivers/net/wireless/ath/ath12k/mac.c
> +++ b/drivers/net/wireless/ath/ath12k/mac.c
> @@@ -4209,7 -4286,7 +4267,8 @@@ static void ath12k_mac_bss_info_changed
>   {
>   	struct ath12k_vif *ahvif = arvif->ahvif;
>   	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
>  +	struct ieee80211_vif_cfg *vif_cfg = &vif->cfg;
> + 	struct ath12k_link_vif *tx_arvif;
>   	struct cfg80211_chan_def def;
>   	u32 param_id, param_value;
>   	enum nl80211_band band;

This is now a conflict between the wireless-next tree and the wireless
tree.

-- 
Cheers,
Stephen Rothwell