From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kalle Valo <kvalo@kernel•org>, Jeff Johnson <jjohnson@kernel•org>
Cc: Ath10k List <ath10k@lists•infradead.org>,
Aditya Kumar Singh <quic_adisi@quicinc•com>,
Baochen Qiang <quic_bqiang@quicinc•com>,
Kalle Valo <quic_kvalo@quicinc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the ath-next tree with the ath tree
Date: Thu, 8 Aug 2024 10:43:48 +1000 [thread overview]
Message-ID: <20240808104348.6846e064@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]
Hi all,
Today's linux-next merge of the ath-next tree got a conflict in:
drivers/net/wireless/ath/ath12k/hw.c
between commit:
38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850")
from the ath tree and commit:
8be12629b428 ("wifi: ath12k: restore ASPM for supported hardwares only")
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/hw.c
index 7b0b6a7f4701,76c0e07a88de..000000000000
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@@ -925,7 -925,7 +925,9 @@@ static const struct ath12k_hw_params at
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+ .iova_mask = 0,
++
+ .supports_aspm = false,
},
{
.name = "wcn7850 hw2.0",
@@@ -1003,7 -1003,7 +1005,9 @@@
.acpi_guid = &wcn7850_uuid,
.supports_dynamic_smps_6ghz = false,
+ .iova_mask = ATH12K_PCIE_MAX_PAYLOAD_SIZE - 1,
++
+ .supports_aspm = true,
},
{
.name = "qcn9274 hw2.0",
@@@ -1077,7 -1077,7 +1081,9 @@@
.acpi_guid = NULL,
.supports_dynamic_smps_6ghz = true,
+ .iova_mask = 0,
++
+ .supports_aspm = false,
},
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-08 0:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-08 0:43 Stephen Rothwell [this message]
2024-08-08 5:13 ` linux-next: manual merge of the ath-next tree with the ath tree Kalle Valo
2024-08-14 1:00 ` Stephen Rothwell
2024-08-15 14:04 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2025-10-30 0:30 Stephen Rothwell
2025-10-30 1:14 ` Jeff Johnson
2025-11-06 0:56 ` Stephen Rothwell
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=20240808104348.6846e064@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ath10k@lists$(echo .)infradead.org \
--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=quic_adisi@quicinc$(echo .)com \
--cc=quic_bqiang@quicinc$(echo .)com \
--cc=quic_kvalo@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