Felix Fietkau <nbd@xxxxxxxx> writes: >> This had conflicts: >> >> $ git pull https://github.com/nbd168/wireless tags/mt76-for-kvalo-2021-01-29 >>>From https://github.com/nbd168/wireless >> * tag mt76-for-kvalo-2021-01-29 -> FETCH_HEAD >> Auto-merging drivers/net/wireless/mediatek/mt76/mt7915/mcu.c >> CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7915/mcu.c >> Auto-merging drivers/net/wireless/mediatek/mt76/mt7615/mcu.c >> Automatic merge failed; fix conflicts and then commit the result. >> >> With this commit from w-d: >> >> b7c568752ef3 mt76: Fix queue ID variable types after mcu queue split >> >> And these commits from your tag: >> >> 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: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?h=pending&id=dfe85c17c7c7183e1d409b948fae9d8e545cb25d >> >> This is the diff output of my resolution: >> >> diff --cc drivers/net/wireless/mediatek/mt76/mt7915/mcu.c >> index e211a2bd4d3c,0296f2aa7997..000000000000 >> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c >> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c >> @@@ -267,22 -260,16 +260,16 @@@ >> if (!seq) >> seq = ++dev->mt76.mcu.msg_seq & 0xf; >> >> - if (cmd == -MCU_CMD_FW_SCATTER) { >> - if (cmd == MCU_CMD(FW_SCATTER)) { >> - txq = MT_MCUQ_FWDL; >> ++ if (cmd == MCU_CMD_FW_SCATTER) { > > This needs to be if (cmd == MCU_CMD(FW_SCATTER)) > The rest looks good to me. Thanks. Pulled manually, fixed that and pushed to master branch. -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
