lkml.org 
[lkml]   [2017]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the devicetree tree with Linus' tree
Hi Rob,

Today's linux-next merge of the devicetree tree got a conflict in:

Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt

between commit:

ea6c3077678f ("dt-bindings: net: Remove duplicate NSP Ethernet MAC binding document")

from Linus' tree and commit:

4da722ca19f3 ("dt-bindings: Remove "status" from examples")

from the devicetree tree.

I fixed it up (the former removed the file, so I did that) 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.



--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2017-09-06 05:01    [W:0.047 / U:1.816 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site