PSA: Please fix your drm-tip merge conflicts

[Thomas Zimmermann]

Hi,

it's not the first time that a merge of drm-tip failed and no one 
bothered to resolve it. It is OK to not know how to fix failed merges. 
It is not OK to leave them broken.

So if you merge a patch into DRM branches and see something like

   dim: FAILURE: Could not merge drm-xe/drm-xe-next
   dim: See the section "Resolving Conflicts when Rebuilding drm-tip"
   dim: in the drm-tip.rst documentation for how to handle this situation.

you are expected to fix it. The docs at

https://drm.pages.freedesktop.org/maintainer-tools/committer/conflict-resolution.html

can help with that. You can also ask on #dri-devel.


Specifically, while merging a fix for bochs, I just got

drm-tip> git diff
diff --cc drivers/gpu/drm/xe/xe_guc_ct.c
index d16eb9ab49fb,c7673f56d413..000000000000
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@@ -907,7 -1028,7 +1028,11 @@@ retry_same_fence
         if (!ret) {
                 xe_gt_err(gt, "Timed out wait for G2H, fence %u, action 
%04x, done %s",
                           g2h_fence.seqno, action[0], 
str_yes_no(g2h_fence.done));
++<<<<<<< HEAD
  +              xa_erase_irq(&ct->fence_lookup, g2h_fence.seqno);
++=======
+               xa_erase(&ct->fence_lookup, g2h_fence.seqno);
++>>>>>>> drm-xe/drm-xe-next
                 mutex_unlock(&ct->lock);
                 return -ETIME;
         }

which must have been there for some time now. I've picked the second option.

Best regards
Thomas


-- 
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)