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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <33bc243d.33c6.19ab8fa1cb4.Coremail.slark_xiao@163.com>
Date: Tue, 25 Nov 2025 11:06:30 +0800 (CST)
From: "Slark Xiao" <slark_xiao@....com>
To: "Jakub Kicinski" <kuba@...nel.org>
Cc: "Loic Poulain" <loic.poulain@....qualcomm.com>, ryazanov.s.a@...il.com,
	johannes@...solutions.net, andrew+netdev@...n.ch,
	davem@...emloft.net, edumazet@...gle.com, pabeni@...hat.com,
	mani@...nel.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re:Re: [PATCH] net: wwan: mhi: Keep modem name match with Foxconn
 T99W640


At 2025-11-25 10:42:19, "Jakub Kicinski" <kuba@...nel.org> 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@163.com/
>> -	    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.