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
Date: Mon, 08 Feb 2021 19:10:12 +0200 [thread overview]
Message-ID: <87lfby4haj.fsf@codeaurora.org> (raw)
In-Reply-To: <00fa069f-3174-85fa-f4d1-fb4e403a9401@nbd.name> (Felix Fietkau's message of "Mon, 8 Feb 2021 12:40:02 +0100")
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
prev parent reply other threads:[~2021-02-08 17:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 17:31 pull request: mt76 2021-01-29 Felix Fietkau
2021-02-08 10:27 ` Kalle Valo
2021-02-08 11:09 ` Lorenzo Bianconi
2021-02-08 17:13 ` Kalle Valo
[not found] ` <20210208102728.F3395C43461@smtp.codeaurora.org>
2021-02-08 11:40 ` Felix Fietkau
2021-02-08 17:10 ` Kalle Valo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lfby4haj.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@nbd.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.