From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rob Herring <robherring2@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Walle <michael@walle.cc>, Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the mfd tree
Date: Tue, 22 Mar 2022 07:18:02 +0000 [thread overview]
Message-ID: <Yjl4KsmOQWVfUui8@google.com> (raw)
In-Reply-To: <20220322141029.1885af98@canb.auug.org.au>
On Tue, 22 Mar 2022, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> Documentation/devicetree/bindings/mfd/syscon.yaml
>
> between commit:
>
> 844dd8fe02f2 ("dt-bindings: Add compatibles for undocumented trivial syscons")
>
> from the mfd tree and commit:
>
> c1ff0c0f24d6 ("dt-bindings: mfd: syscon: add microchip,lan966x-cpu-syscon compatible")
>
> from the devicetree tree.
Did you accidentally hoover this up Rob?
--
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2022-03-22 7:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 3:10 linux-next: manual merge of the devicetree tree with the mfd tree Stephen Rothwell
2022-03-22 7:18 ` Lee Jones [this message]
2022-03-22 12:43 ` Rob Herring
-- strict thread matches above, loose matches on Subject: below --
2025-07-18 6:04 Stephen Rothwell
2020-10-06 6:03 Stephen Rothwell
2020-10-01 6:22 Stephen Rothwell
2020-10-01 6:25 ` Krzysztof Kozlowski
2020-10-01 12:31 ` Rob Herring
2020-10-10 10:01 ` Leizhen (ThunderTown)
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=Yjl4KsmOQWVfUui8@google.com \
--to=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michael@walle.cc \
--cc=robh@kernel.org \
--cc=robherring2@gmail.com \
--cc=sfr@canb.auug.org.au \
/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.