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

[Kalle Valo]

Stephen Rothwell <sfr at canb.auug.org.au> writes:

> 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.

Thanks, the fix looks correct to me.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches