Hi all, Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/tests/drm_mm_test.c
between commit:
2ba157983974 ("drm/tests: Fix incorrect argument in drm_test_mm_insert_range")
from Linus' tree and commit:
078a5b498d6a ("drm/tests: Remove slow tests")
from the drm-misc tree.
I fixed it up (the latter removed the code updated by the former, 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
pgp6cGcJ1wa21.pgp
Description: OpenPGP digital signature
