From: Jakub Kicinski <kuba@kernel.org>
To: "Slark Xiao" <slark_xiao@163.com>
Cc: "Loic Poulain" <loic.poulain@oss.qualcomm.com>,
ryazanov.s.a@gmail.com, johannes@sipsolutions.net,
andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
pabeni@redhat.com, mani@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: wwan: mhi: Keep modem name match with Foxconn T99W640
Date: Mon, 24 Nov 2025 18:42:19 -0800 [thread overview]
Message-ID: <20251124184219.0a34e86e@kernel.org> (raw)
In-Reply-To: <623c5da7.9de2.19ab555133e.Coremail.slark_xiao@163.com>
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.
next prev parent reply other threads:[~2025-11-25 2:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-20 11:41 [PATCH] net: wwan: mhi: Keep modem name match with Foxconn T99W640 Slark Xiao
2025-11-21 12:57 ` Loic Poulain
2025-11-24 2:21 ` Slark Xiao
2025-11-22 2:08 ` Jakub Kicinski
2025-11-24 2:30 ` Slark Xiao
2025-11-24 9:53 ` Loic Poulain
2025-11-24 10:07 ` Slark Xiao
2025-11-25 2:42 ` Jakub Kicinski [this message]
2025-11-25 3:06 ` Slark Xiao
2025-11-25 3:12 ` Jakub Kicinski
2025-11-25 3:16 ` Slark Xiao
2025-11-25 3:21 ` Jakub Kicinski
2025-11-25 3:31 ` Slark Xiao
2025-11-25 4:55 ` Manivannan Sadhasivam
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=20251124184219.0a34e86e@kernel.org \
--to=kuba@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@oss.qualcomm.com \
--cc=mani@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=ryazanov.s.a@gmail.com \
--cc=slark_xiao@163.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).