Lorenzo Bianconi [off-list ref] writes:

[...]

quoted

b8135057988e mt76: mt7915: simplify mt7915_mcu_send_message routine
c203dd621780 mt76: mt7915: rework mcu API

This was not easy to fix. Felix & Lorenzo, please carefully check my resolution
in the pending branch:

Hi Kalle,

it is not easy to check a patch of a patch :) one comment inline.

Tell me about it, fixing conflicts is an art form in it's own right :)
This is exactly why I'm keeping the bar high for fixes going
wireless-drivers, I just don't want to deal with the conflicts.

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

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