Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1663384

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

Show all headers | View raw

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@canb.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.

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the devicetree tree with the renesas  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-09 06:00 +0200
  Re: linux-next: manual merge of the devicetree tree with the renesas tree Rob Herring <robherring2@gmail.com> - 2017-06-09 15:50 +0200
    Re: linux-next: manual merge of the devicetree tree with the renesas  tree Simon Horman <horms@verge.net.au> - 2017-06-12 12:00 +0200
  Re: linux-next: manual merge of the devicetree tree with the renesas  tree Simon Horman <horms@verge.net.au> - 2017-06-09 18:10 +0200

csiph-web