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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAL_Jsq+54TmvzTJ9iEJOWBjVd0dukZGSHN97Kqtfhpw_8f3kYQ@mail.gmail.com>
Date:   Tue, 22 Mar 2022 07:43:54 -0500
From:   Rob Herring <robherring2@...il.com>
To:     Lee Jones <lee.jones@...aro.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michael Walle <michael@...le.cc>
Subject: Re: linux-next: manual merge of the devicetree tree with the mfd tree

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