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] [thread-next>] [day] [month] [year] [list]

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

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