linux-kernel - Re: linux-next: manual merge of the devicetree tree with the rockchip and sunxi trees

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_JsqL36Cw9xPROs8WsPoOJqn-7EdyGvxG4w=6TdQGZ-apGSA@mail.gmail.com>
Date:   Fri, 22 Sep 2017 11:19:02 -0500
From:   Rob Herring <robherring2@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Heiko Stuebner <heiko@...ech.de>,
        Maxime Ripard <maxime.ripard@...e-electrons.com>,
        Chen-Yu Tsai <wens@...e.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Tomas Novotny <tomas@...otny.cz>,
        Jagan Teki <jagan@...rulasolutions.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the rockchip
 and sunxi trees

On Tue, Sep 19, 2017 at 9:26 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Rob,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
>   Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
>   50544f39018f ("dt-bindings: Add vendor prefix for Amarula Solutions")
>
> from the rockchip tree, commit:
>
>   912620c02c31 ("dt-bindings: add vendor prefix for Touchless Biometric Systems AG")
>
> from the sunxi tree and commit:
>
>   e6262a54124d ("dt-bindings: vendor-prefixes: align indentation of company names`")
> (this is going to be fun :-()

I've dropped it. Was going to send for rc2, but I guess that's not
going to be early enough. I'll plan to do it just before rc1 next
cycle (or get distracted and forget about it).

Rob