linux-kernel - Re: linux-next: manual merge of the devicetree tree with the renesas 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: <CAL_JsqKZNof2oY-zyRx6UXmGw8aHt5-_NhWU4MMBT-gXNePvsw@mail.gmail.com>
Date:   Fri, 9 Jun 2017 08:46:27 -0500
From:   Rob Herring <robherring2@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Simon Horman <horms@...ge.net.au>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Marcus Cooper <codekipper@...il.com>,
        Biju Das <biju.das@...renesas.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the renesas tree

On Thu, Jun 8, 2017 at 10:53 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:
>
>   d795f15618b8 ("of: Add vendor prefix for iWave Systems Technologies Pvt. Ltd")
>
> from the renesas tree and commit:
>
>   97a0268e764c ("devicetree: add Itead vendor prefix")
>
> from the devicetree tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Simon, I can pick up the conflicting patch if you want to drop it.

Rob