All of
 help / color / mirror / Atom feed
* linux-next: manual merge of the drm-msm tree with the drm-next tree
@ 2021-07-29 11:10 Mark Brown
  2021-07-29 11:44 ` Christian König
  0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2021-07-29 11:10 UTC (permalink / raw)
  To: Rob Clark, Sean Paul
  Cc: Christian König, Linux Kernel Mailing List,
	Linux Next Mailing List, Rob Clark

Hi all,

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


between commit:

  60f800b2bdfa ("drm/msm: always wait for the exclusive fence")

from the drm-next tree and commit:

  1d8a5ca436ee ("drm/msm: Conversion to drm scheduler")

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.

diff --cc drivers/gpu/drm/msm/msm_gem.c
index 39c35414d7b5,5db07fc287ad..000000000000
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-07-29 14:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-29 11:10 linux-next: manual merge of the drm-msm tree with the drm-next tree Mark Brown
2021-07-29 11:44 ` Christian König
2021-07-29 12:25   ` Mark Brown
2021-07-29 14:47     ` Rob Clark

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.