Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: kvalo=codeaurora.org@mg.codeaurora.org
DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4A135C433C6
From:   Kalle Valo <kvalo@codeaurora.org>
To:     Felix Fietkau <nbd@nbd.name>
Cc:     linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: pull request: mt76 2021-01-29
References: <3eba5570-7cff-f51e-4050-aa0054f98f81@nbd.name>
        <20210208102728.F3395C43461@smtp.codeaurora.org>
        <00fa069f-3174-85fa-f4d1-fb4e403a9401@nbd.name>
Date:   Mon, 08 Feb 2021 19:10:12 +0200
In-Reply-To: <00fa069f-3174-85fa-f4d1-fb4e403a9401@nbd.name> (Felix Fietkau's
        message of "Mon, 8 Feb 2021 12:40:02 +0100")
Message-ID: <87lfby4haj.fsf@codeaurora.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Felix Fietkau <nbd@nbd.name> 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