From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Manivannan Sadhasivam <manivannan.sadhasivam@linaro•org>,
Kalle Valo <kvalo@kernel•org>, Jeff Johnson <jjohnson@kernel•org>
Cc: Ath10k List <ath10k@lists•infradead.org>,
Jeff Johnson <jeff.johnson@oss•qualcomm.com>,
Kiran Venkatappa <quic_kiranv@quicinc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Manivannan Sadhasivam <manivannan.sadhasivam@oss•qualcomm.com>
Subject: linux-next: manual merge of the mhi tree with the ath-next tree
Date: Mon, 5 Jan 2026 15:42:43 +1100 [thread overview]
Message-ID: <20260105154243.7cd5d049@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2026-01-05 4:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-05 4:42 Stephen Rothwell [this message]
2026-01-05 5:27 ` linux-next: manual merge of the mhi tree with the ath-next tree Manivannan Sadhasivam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260105154243.7cd5d049@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ath10k@lists$(echo .)infradead.org \
--cc=jeff.johnson@oss$(echo .)qualcomm.com \
--cc=jjohnson@kernel$(echo .)org \
--cc=kvalo@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=manivannan.sadhasivam@linaro$(echo .)org \
--cc=manivannan.sadhasivam@oss$(echo .)qualcomm.com \
--cc=quic_kiranv@quicinc$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox