Re: linux-next: manual merge of the devicetree tree with the mfd tree

[Rob Herring]

On Tue, Mar 22, 2022 at 2:18 AM Lee Jones <lee.jones@xxxxxxxxxx> wrote:
>
> 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?

I'll drop it.

Rob