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: Mon, 3 Oct 2022 08:47:25 +0100 [thread overview]
Message-ID: <YzqTjb9YbECU+EEt@google.com> (raw)
In-Reply-To: <ef71ab54-d337-1c4c-9b90-ca39b1c1ed17@linaro.org>
On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:
> On 30/09/2022 14:45, Lee Jones wrote:
> > 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?
>
>
> This was a part of big set MFD + ARM64 dts, so I guess it just slipped in:
>
> https://lore.kernel.org/all/20220819083209.50844-1-krzysztof.kozlowski@linaro.org/
Thanks for the info.
Fair enough. It happens.
--
Lee Jones [李琼斯]
next prev parent reply other threads:[~2022-10-03 8:14 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
2022-09-30 16:28 ` Krzysztof Kozlowski
2022-10-03 7:47 ` Lee Jones [this message]
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=YzqTjb9YbECU+EEt@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox