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

[Slark Xiao]

At 2025-11-24 17:53:54, "Loic Poulain" <loic.poulain@xxxxxxxxxxxxxxxx> wrote:
>On Mon, Nov 24, 2025 at 3:31 AM Slark Xiao <slark_xiao@xxxxxxx> wrote:
>>
>>
>> At 2025-11-22 10:08:36, "Jakub Kicinski" <kuba@xxxxxxxxxx> wrote:
>> >On Thu, 20 Nov 2025 19:41:15 +0800 Slark Xiao wrote:
>> >> Correct it since M.2 device T99W640 has updated from T99W515.
>> >> We need to align it with MHI side otherwise this modem can't
>> >> get the network.
>> >>
>> >> Fixes: ae5a34264354 ("bus: mhi: host: pci_generic: Fix the modem name of Foxconn T99W640")
>> >> Fixes: 65bc58c3dcad ("net: wwan: mhi: make default data link id configurable")
>> >> Signed-off-by: Slark Xiao <slark_xiao@xxxxxxx>
>> >
>> >Doesn't apply to either networking tree :(
>> I have cc the email address by the system command
>> "scripts/get_maintainer.pl patch". Do you mean shall I remove
>> netdev@xxxxxxxxxxxxxxx by manual?
>
>This means your patch does not apply cleanly to net.git [1] or net-next.git.
>So you have to rebase your change on the net.git tree before resending.
>
>Regards,
>Loic
>
>[1] https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
Hi Loic,
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?

Thanks