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

Stephen Rothwell
2018-01-15T01:08:55Z

Hi all,

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

drivers/gpu/drm/tegra/sor.c

between commit:

d780537f9b49 ("drm/tegra: sor: Fix hang on Tegra124 eDP")

from Linus' tree and commit:

1087fac18b8e ("drm/tegra: dc: Use direct offset to plane registers")

from the drm tree.

I fixed it up (I just included the comment from the former) 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