linux-next: manual merge of the devicetree tree with the devicetree-fixes tree

[Stephen Rothwell]

Hi all,

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

  Documentation/devicetree/bindings/Makefile

between commit:

  48ae42d22a71 ("dt-bindings: Don't error out on yamllint errors")

from the devicetree-fixes tree and commit:

  3e95dfb315de ("dt-bindings: Don't error out on yamllint and dt-doc-validate errors")

from the devicetree tree.

I fixed it up (I just used the latter version) 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

Attachment: pgpwR3ckhci_n.pgp
Description: OpenPGP digital signature