Subject: Re: linux-next: manual merge of the ath-next tree with the ath tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 14 Aug 2024 11:00:19 +1000

Hi all,

On Thu, 8 Aug 2024 10:43:48 +1000 Stephen Rothwell <[email-masked]> 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