linux-kernel - Re: linux-next: manual merge of the ath-next tree with the ath 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: <83c8504d-3159-4a87-a1ea-0fef46bf6762@oss.qualcomm.com>
Date: Wed, 29 Oct 2025 18:14:55 -0700
From: Jeff Johnson <jeff.johnson@....qualcomm.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Kalle Valo <kvalo@...nel.org>,
        Jeff Johnson <jjohnson@...nel.org>
Cc: Aditya Kumar Singh <aditya.kumar.singh@....qualcomm.com>,
        Ath10k List <ath10k@...ts.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Maharaja Kennadyrajan <maharaja.kennadyrajan@....qualcomm.com>,
        Miaoqing Pan <miaoqing.pan@....qualcomm.com>
Subject: Re: linux-next: manual merge of the ath-next tree with the ath tree

On 10/29/2025 5:30 PM, Stephen Rothwell wrote:
> Hi all,
> 
> 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.
> 

Thanks, Stephen

That resolution matches the text I've prepared for my upcoming pull request:

Note to maintainers:

There is a trivial conflict between two patches:

In ath/ath-current:
9222582ec524 ("Revert "wifi: ath12k: Fix missing station power save configuration"")

In ath/ath-next:
6917e268c433 ("wifi: ath12k: Defer vdev bring-up until CSA finalize to avoid stale beacon")

The resolution is to take both hunks, ordering them in reverse xmas tree style.