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

From: Kalle Valo <[email-masked]>
Date: Thu, 31 Oct 2019 11:36:11 +0200

Stephen Rothwell <[email-masked]> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
>
> between commit:
>
>   3d206e6899a0 ("iwlwifi: fw api: support new API for scan config cmd")
>
> from the wireless-drivers tree and commit:
>
>   65b9425ce9aa ("iwlwifi: rx: use new api to get band from rx mpdu")
>
> from the wireless-drivers-next tree.

Thanks, the resolution looked simple enough so I'm not taking any extra
actions because of this (for example merging wireless-drivers to
wireless-drivers-next etc).

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