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

[Mark Brown]

Hi Rob,

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

  drivers/gpu/drm/msm/msm_gem_submit.c

between commit:

  06451a3d1d7771 ("drm/msm: fix _NO_IMPLICIT fencing case")

from Linus' tree and commit:

  642e5ef8c6c496 ("drm/msm: fix _NO_IMPLICIT fencing case")

from the drm-msm tree.

I fixed it up (see below) 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.

(null diff)

Attachment: signature.asc
Description: PGP signature