From: Jakub Kicinski <kuba@kernel.org>
To: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Loic Poulain <loic.poulain@linaro.org>,
davem@davemloft.net, netdev@vger.kernel.org,
linux-arm-msm@vger.kernel.org, bbhatt@codeaurora.org,
willemdebruijn.kernel@gmail.com, jhugo@codeaurora.org,
hemantk@codeaurora.org
Subject: Re: [PATCH v10 1/2] bus: mhi: Add mhi_queue_is_full function
Date: Fri, 6 Nov 2020 08:39:18 -0800 [thread overview]
Message-ID: <20201106083918.5ea0674b@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> (raw)
In-Reply-To: <B9A7A95E-BD2F-49C0-A28C-56A8E6D903AC@linaro.org>
On Fri, 06 Nov 2020 21:58:12 +0530 Manivannan Sadhasivam wrote:
>>> Since you've applied now, what would you propose?
>>
>> Do you need mhi_queue_is_full() in other branches, or are you just
>> concerned about the conflicts?
>
> Yes, I need this patch in mhi-next.
>
>> I'm assuming the concern is just about the mhi/core patch, or would
>> you need to refactor something in the net driver as well?
>
> Just the mhi_queue_is_full() patch.
Okay, I think you can just apply that patch to your tree again and git
should figure out it's a duplicate. Not optimal, because the change will
have two hashes, but the function is trivial, shouldn't be an issue
even if conflict happens.
Will you need it in wireless (ath11k), or only in other trees?
If it ends up in the wireless tree Dave or I will do the resolution when
we pull from Kalle so it won't even appear to Linus (but then it should
go into wireless through an immutable branch).
next prev parent reply other threads:[~2020-11-06 16:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 17:23 [PATCH v10 1/2] bus: mhi: Add mhi_queue_is_full function Loic Poulain
2020-11-03 17:23 ` [PATCH v10 2/2] net: Add mhi-net driver Loic Poulain
2020-11-06 0:57 ` Jakub Kicinski
2020-11-06 0:57 ` [PATCH v10 1/2] bus: mhi: Add mhi_queue_is_full function Jakub Kicinski
2020-11-06 5:13 ` Manivannan Sadhasivam
2020-11-06 16:04 ` Jakub Kicinski
2020-11-06 16:28 ` Manivannan Sadhasivam
2020-11-06 16:39 ` Jakub Kicinski [this message]
2020-11-10 18:44 ` Kalle Valo
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=20201106083918.5ea0674b@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com \
--to=kuba@kernel.org \
--cc=bbhatt@codeaurora.org \
--cc=davem@davemloft.net \
--cc=hemantk@codeaurora.org \
--cc=jhugo@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=willemdebruijn.kernel@gmail.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).