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

Stephen Rothwell
2017-04-05T00:30:21Z

Hi Dave,

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

drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

between commit:

f7652afa8ead ("drm/vmwgfx: Type-check lookups of fence objects")

from Linus' tree and commit:

8dfe162ac74f ("gpu: drm: drivers: Convert printk(KERN_<LEVEL> to pr_<level>")

from the drm tree.

I fixed it up (the former moved and updated the code updated by
the latter, so I just used 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