Hi,
Thanks for the heads-up!
On Fri, 2024-02-09 at 10:56 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the wireless-next tree got a conflict in:
>
> drivers/net/wireless/intel/iwlwifi/mvm/tx.c
>
> between commit:
>
> 2e57b77583ca ("wifi: iwlwifi: mvm: use correct address 3 in A-MSDU")
>
> from the wireless tree and commit:
>
> 3d869feacb74 ("wifi: iwlwifi: mvm: use FW rate for non-data only on new devices")
I had a different (potential) conflict on my radar and pulled wireless
into wireless-next to avoid it, but this one wasn't on my radar at all.
Sorry about that.
> I fixed it up (see below)
That obviously looks fine, thanks!
johannes
