* linux-next: manual merge of the mhi tree with the ath-next tree
@ 2026-01-05 4:42 Stephen Rothwell
2026-01-05 5:27 ` Manivannan Sadhasivam
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2026-01-05 4:42 UTC (permalink / raw)
To: Manivannan Sadhasivam, Kalle Valo, Jeff Johnson
Cc: Ath10k List, Jeff Johnson, Kiran Venkatappa,
Linux Kernel Mailing List, Linux Next Mailing List,
Manivannan Sadhasivam
[-- Attachment #1: Type: text/plain, Size: 2972 bytes --]
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.
From 667166ff448d06ed3ef9671bf6c8fe7337b71b0a Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb•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@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the mhi tree with the ath-next tree
2026-01-05 4:42 linux-next: manual merge of the mhi tree with the ath-next tree Stephen Rothwell
@ 2026-01-05 5:27 ` Manivannan Sadhasivam
0 siblings, 0 replies; 2+ messages in thread
From: Manivannan Sadhasivam @ 2026-01-05 5:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Manivannan Sadhasivam, Kalle Valo, Jeff Johnson, Ath10k List,
Jeff Johnson, Kiran Venkatappa, Linux Kernel Mailing List,
Linux Next Mailing List
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@canb•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@canb•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
--
மணிவண்ணன் சதாசிவம்
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-01-05 5:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-05 4:42 linux-next: manual merge of the mhi tree with the ath-next tree Stephen Rothwell
2026-01-05 5:27 ` Manivannan Sadhasivam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox