[PATCH] dim: enforce consistent conflictstyle in drm-tip

[Daniel Vetter]

On Wed, Oct 11, 2017 at 2:07 PM, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> Quoting Daniel Vetter (2017-10-11 09:54:00)
>> Otherwise the tree rebuilding fails. This might be the reason why some
>> git versions create different conflicts, since checking
>> git-sources/rerere.c didn't provide any hint at all about what has
>> changed.
>
> For us simpletons, can you show us the difference in output so we don't
> get confused?

diff3:

Paste #208585: Untitled ASCII paste by 185.94.189.189

diff --cc drivers/gpu/drm/i915/intel_display.c
index 5c7828c52d12,b2c5fba102e1..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -10245,10 -10244,8 +10244,23 @@@ struct drm_display_mode *intel_crtc_mod
  {
  struct drm_i915_private *dev_priv = to_i915(dev);
  struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
++<<<<<<< HEAD
 + enum transcoder cpu_transcoder;
++||||||| merged common ancestors
++ enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
++=======
++>>>>>>> drm-intel/drm-intel-next-queued
  struct drm_display_mode *mode;
  struct intel_crtc_state *pipe_config;
++<<<<<<< HEAD
 + u32 htot, hsync, vtot, vsync;
++||||||| merged common ancestors
++ int htot = I915_READ(HTOTAL(cpu_transcoder));
++ int hsync = I915_READ(HSYNC(cpu_transcoder));
++ int vtot = I915_READ(VTOTAL(cpu_transcoder));
++ int vsync = I915_READ(VSYNC(cpu_transcoder));
++=======
++>>>>>>> drm-intel/drm-intel-next-queued
  enum pipe pipe = intel_crtc->pipe;

  mode = kzalloc(sizeof(*mode), GFP_KERNEL);


vs merge:

Paste #208585: Untitled ASCII paste by 185.94.189.189

diff --cc drivers/gpu/drm/i915/intel_display.c
index 5c7828c52d12,b2c5fba102e1..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -10245,10 -10244,8 +10244,23 @@@ struct drm_display_mode *intel_crtc_mod
  {
  struct drm_i915_private *dev_priv = to_i915(dev);
  struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
++<<<<<<< HEAD
 + enum transcoder cpu_transcoder;
++=======
++>>>>>>> drm-intel/drm-intel-next-queued
  struct drm_display_mode *mode;
  struct intel_crtc_state *pipe_config;
++<<<<<<< HEAD
 + u32 htot, hsync, vtot, vsync;
++=======
++>>>>>>> drm-intel/drm-intel-next-queued
  enum pipe pipe = intel_crtc->pipe;

  mode = kzalloc(sizeof(*mode), GFP_KERNEL);


It's kinda silly that git's internal representation of a conflict
depends upon how it's presented in the work tree, but oh well that's
what it is. "merge" is the default that I guess most are used to.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch