* Re: linux-next: manual merge of the ath-next tree with the ath tree [not found] <20240808104348.6846e064@canb.auug.org.au> @ 2024-08-14 1:00 ` Stephen Rothwell 2024-08-15 14:04 ` Kalle Valo 0 siblings, 1 reply; 3+ messages in thread From: Stephen Rothwell @ 2024-08-14 1:00 UTC (permalink / raw) To: Kalle Valo, Jeff Johnson, Johannes Berg Cc: Ath10k List, Aditya Kumar Singh, Baochen Qiang, Kalle Valo, Linux Kernel Mailing List, Linux Next Mailing List, Wireless [-- Attachment #1: Type: text/plain, Size: 1882 bytes --] Hi all, On Thu, 8 Aug 2024 10:43:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > 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. > > 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, > }, > }; > This is now a conflict between the wireless-next tree and the ath tree. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the ath-next tree with the ath tree 2024-08-14 1:00 ` linux-next: manual merge of the ath-next tree with the ath tree Stephen Rothwell @ 2024-08-15 14:04 ` Kalle Valo 0 siblings, 0 replies; 3+ messages in thread From: Kalle Valo @ 2024-08-15 14:04 UTC (permalink / raw) To: Stephen Rothwell Cc: Jeff Johnson, Johannes Berg, Ath10k List, Aditya Kumar Singh, Baochen Qiang, Linux Kernel Mailing List, Linux Next Mailing List, Wireless Stephen Rothwell <sfr@canb.auug.org.au> writes: > Hi all, > > On Thu, 8 Aug 2024 10:43:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> >> 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. >> >> 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, >> }, >> }; >> > > This is now a conflict between the wireless-next tree and the ath tree. Thanks. The plan is that the network maintainers will fix this once the commits "meet" in net-next. We are trying to avoid unnessary merges. -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <20251030113037.1932c6d2@canb.auug.org.au>]
* Re: linux-next: manual merge of the ath-next tree with the ath tree [not found] <20251030113037.1932c6d2@canb.auug.org.au> @ 2025-11-06 0:56 ` Stephen Rothwell 0 siblings, 0 replies; 3+ messages in thread From: Stephen Rothwell @ 2025-11-06 0:56 UTC (permalink / raw) To: Johannes Berg Cc: Kalle Valo, Jeff Johnson, Aditya Kumar Singh, Jeff Johnson, Ath10k List, Linux Kernel Mailing List, Linux Next Mailing List, Maharaja Kennadyrajan, Miaoqing Pan, Wireless [-- Attachment #1: Type: text/plain, Size: 1627 bytes --] Hi all, On Thu, 30 Oct 2025 11:30:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/net/wireless/ath/ath12k/mac.c > index db351c922018,e79d457e3c03..000000000000 > --- a/drivers/net/wireless/ath/ath12k/mac.c > +++ b/drivers/net/wireless/ath/ath12k/mac.c > @@@ -4209,7 -4286,7 +4267,8 @@@ static void ath12k_mac_bss_info_changed > { > struct ath12k_vif *ahvif = arvif->ahvif; > struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif); > + struct ieee80211_vif_cfg *vif_cfg = &vif->cfg; > + struct ath12k_link_vif *tx_arvif; > struct cfg80211_chan_def def; > u32 param_id, param_value; > enum nl80211_band band; This is now a conflict between the wireless-next tree and the wireless tree. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-11-06 0:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20240808104348.6846e064@canb.auug.org.au>
2024-08-14 1:00 ` linux-next: manual merge of the ath-next tree with the ath tree Stephen Rothwell
2024-08-15 14:04 ` Kalle Valo
[not found] <20251030113037.1932c6d2@canb.auug.org.au>
2025-11-06 0:56 ` Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).