linux-next: manual merge of the drm tree with Linus' tree

Stephen Rothwell
2017-11-23T23:37:15Z

Hi all,

FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.

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

drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c

between commits:

0290c4ca2536 ("of: overlay: rename identifiers to more reflect what they do")
24789c5ce5a3 ("of: overlay: detect cases where device tree may become corrupt")
f948d6d8b792 ("of: overlay: avoid race condition between applying multiple overlays")

from Linus' tree and commit:

739acd85ffdb ("drm/tilcdc: Remove obsolete "ti,tilcdc,slave" dts binding support")

from the drm tree.

I fixed it up (the latter 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