linux-kernel - Re: linux-next: manual merge of the mhi tree with the ath-next 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 for Android: free password hash cracker in your pocket

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

Message-ID: <yvsigdjgbc5wxm7bcbppavepib7qfcuc3mua66raacs2gka3l7@r2vfpa2zwxv3>
Date: Mon, 5 Jan 2026 10:57:58 +0530
From: Manivannan Sadhasivam <manivannan.sadhasivam@....qualcomm.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>,
        Kalle Valo <kvalo@...nel.org>, Jeff Johnson <jjohnson@...nel.org>,
        Ath10k List <ath10k@...ts.infradead.org>,
        Jeff Johnson <jeff.johnson@....qualcomm.com>,
        Kiran Venkatappa <quic_kiranv@...cinc.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mhi tree with the ath-next tree

On Mon, Jan 05, 2026 at 03:42:43PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mhi tree got a conflict in:
> 
>   drivers/net/wireless/ath/ath12k/mhi.c
> 
> between commits:
> 
>   7f54938fc525 ("wifi: ath12k: Move Wi-Fi 7 MHI configuration to dedicated file")
>   a72027045263 ("wifi: ath12k: Modularize driver into common and Wi-Fi 7 specific components")
>   bce3b73d1ca7 ("wifi: ath12k: Rename ath12k_* symbols to ath12k_wifi7_* for clarity")
> 
> from the ath-next tree and commit:
> 
>   51731792a25c ("net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels")
> 
> from the mhi tree.
> 
> I fixed it up (I used the former version of this file and then
> applied the following merge resolution patch) 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 for providing the resolution. It looks good to me. I'll mention this to
Greg while sending the MHI PR and I hope Jeff also does the same in his ath PR
as well so that the conflict resolution is well noted.

- Mani

> From 667166ff448d06ed3ef9671bf6c8fe7337b71b0a Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Mon, 5 Jan 2026 15:39:19 +1100
> Subject: [PATCH] fix up for "net: qrtr: Drop the MHI auto_queue feature for
>  IPCR DL channels"
> 
> interacting with commits
> 
>   7f54938fc525 ("wifi: ath12k: Move Wi-Fi 7 MHI configuration to dedicated file"
> )
>   a72027045263 ("wifi: ath12k: Modularize driver into common and Wi-Fi 7 specifi
> c components")
>   bce3b73d1ca7 ("wifi: ath12k: Rename ath12k_* symbols to ath12k_wifi7_* for clarity")
> 
> from the ath-next tree.
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/net/wireless/ath/ath12k/wifi7/mhi.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath12k/wifi7/mhi.c b/drivers/net/wireless/ath/ath12k/wifi7/mhi.c
> index b8d972659314..988affafcfd1 100644
> --- a/drivers/net/wireless/ath/ath12k/wifi7/mhi.c
> +++ b/drivers/net/wireless/ath/ath12k/wifi7/mhi.c
> @@ -20,7 +20,6 @@ static const struct mhi_channel_config ath12k_wifi7_mhi_channels_qcn9274[] = {
>  		.lpm_notify = false,
>  		.offload_channel = false,
>  		.doorbell_mode_switch = false,
> -		.auto_queue = false,
>  	},
>  	{
>  		.num = 21,
> @@ -34,7 +33,6 @@ static const struct mhi_channel_config ath12k_wifi7_mhi_channels_qcn9274[] = {
>  		.lpm_notify = false,
>  		.offload_channel = false,
>  		.doorbell_mode_switch = false,
> -		.auto_queue = true,
>  	},
>  };
>  
> @@ -85,7 +83,6 @@ static const struct mhi_channel_config ath12k_wifi7_mhi_channels_wcn7850[] = {
>  		.lpm_notify = false,
>  		.offload_channel = false,
>  		.doorbell_mode_switch = false,
> -		.auto_queue = false,
>  	},
>  	{
>  		.num = 21,
> @@ -99,7 +96,6 @@ static const struct mhi_channel_config ath12k_wifi7_mhi_channels_wcn7850[] = {
>  		.lpm_notify = false,
>  		.offload_channel = false,
>  		.doorbell_mode_switch = false,
> -		.auto_queue = true,
>  	},
>  };
>  
> -- 
> 2.52.0
> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
மணிவண்ணன் சதாசிவம்