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 for Android: free password hash cracker in your pocket

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

Date:   Mon, 12 Jun 2017 11:58:39 +0200
From:   Simon Horman <horms@...ge.net.au>
To:     Rob Herring <robherring2@...il.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        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 Fri, Jun 09, 2017 at 08:46:27AM -0500, Rob Herring wrote:
> 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.

Thanks, I will drop it.