linux-next: manual merge of the drm-misc tree with the drm tree
From: Stephen Rothwell
Date: Tue Sep 27 2016 - 22:11:25 EST
Today's linux-next merge of the drm-misc tree got conflicts in:
bdfd36ef8e64 ("drm/sti: Fix sparse warnings")
b4bba92dfbe2 ("drm/sti: remove stih415-416 platform support")
from the drm tree and commit:
bd233af436ba ("drm/sti: mark symbols static where possible")
from the drm-misc tree.
I fixed it up (I just used the drm-misc tree versions and removed the
comflicting function in the sti_mixer.c case) 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.