Re:Re: [PATCH] net: wwan: mhi: Keep modem name match with Foxconn T99W640

[Slark Xiao]

At 2025-11-25 10:42:19, "Jakub Kicinski" <kuba@xxxxxxxxxx> wrote:
>On Mon, 24 Nov 2025 18:07:22 +0800 (CST) Slark Xiao wrote:
>> I see. Actually this patch was generated in mhi code base.
>> But I didn't see any difference of this file between mhi and net.
>> And, there is another commit may affect this change:
>> 
>> https://lore.kernel.org/netdev/20251119105615.48295-3-slark_xiao@xxxxxxx/
>> -	    strcmp(cntrl->name, "foxconn-t99w515") == 0)
>> +	    strcmp(cntrl->name, "foxconn-t99w515") == 0 ||
>> +	    strcmp(cntrl->name, "foxconn-t99w760") == 0)
>> 
>> I edited above commit firstly and now it's reviewed status but not applied.
>> If I update this change based net or net-dev, above T99W760 support 
>> commit then would have a conflict since they are not a common
>> series. How shall I do to avoid this potential conflict?
>
>Are you saying you have to concurrent submissions changing one file?
>If yes please repost them as a series.
One patch of previous series has been applied. Does it matter to repost a new
series including that applied patch?
Or net team apply the rest patch of previous series , then try to review this patch
again. I guess there is no conflict any more.