All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Jones <lee@kernel.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: broonie@kernel.org, Bjorn Andersson <andersson@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mfd tree with the qcom tree
Date: Fri, 30 Sep 2022 13:45:51 +0100	[thread overview]
Message-ID: <Yzbk/6SQdpNQTahV@google.com> (raw)
In-Reply-To: <1e9a21a3-d6c3-3f76-18dc-ff14e8609846@linaro.org>

On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:

> On 30/09/2022 13:58, broonie@kernel.org wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the mfd tree got a conflict in:
> > 
> >   Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> > 
> 
> Thanks Mark.
> 
> > between commit:
> > 
> >   4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")
> 
> It seems this commit was picked by both Bjorn/qcom and Lee/MFD.
> 
> > 
> > from the qcom tree and commits:
> > 
> >   f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
> >   a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")
> 
> This commit depends on the duplicated one (on "Add several devices"), so
> I think all set can stay in MFD and instead Bjorn could drop his copy of
> the commit.

Not sure why Bjorn is picking up MFD patches?

Was this a mistake Bjorn?

-- 
Lee Jones [李琼斯]

  reply	other threads:[~2022-09-30 12:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-30 11:58 linux-next: manual merge of the mfd tree with the qcom tree broonie
2022-09-30 12:06 ` Krzysztof Kozlowski
2022-09-30 12:45   ` Lee Jones [this message]
2022-09-30 16:28     ` Krzysztof Kozlowski
2022-10-03  7:47       ` Lee Jones
2022-10-04  3:29   ` Stephen Rothwell

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=Yzbk/6SQdpNQTahV@google.com \
    --to=lee@kernel.org \
    --cc=andersson@kernel.org \
    --cc=broonie@kernel.org \
    --cc=krzysztof.kozlowski@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.