[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/atomic-helper: always track connector commits, too

[Patchwork]

== Series Details ==

Series: series starting with [1/2] drm/atomic-helper: always track connector commits, too
URL   : https://patchwork.freedesktop.org/series/33591/
State : failure

== Summary ==

  CHK     include/config/kernel.release
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  CHK     include/generated/bounds.h
  CHK     include/generated/timeconst.h
  CHK     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  CHK     scripts/mod/devicetable-offsets.h
  CHK     include/generated/compile.h
  CHK     kernel/config_data.h
  CC [M]  drivers/gpu/drm/i915/intel_dp.o
drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_check_link_status’:
drivers/gpu/drm/i915/intel_dp.c:4277:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4281:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
  struct drm_device *dev = intel_dp_to_dev(intel_dp);
  ^~~~~~
drivers/gpu/drm/i915/intel_dp.c:4282:1: error: version control conflict marker in file
 >>>>>>> drm/i915: sync dp link status checks against atomic commmits
 ^~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4287:42: error: ‘link_status’ undeclared (first use in this function)
  if (!intel_dp_get_link_status(intel_dp, link_status)) {
                                          ^~~~~~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4287:42: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/i915/intel_dp.c:4292:7: error: ‘conn_state’ undeclared (first use in this function)
  if (!conn_state->crtc)
       ^~~~~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4281:21: error: unused variable ‘dev’ [-Werror=unused-variable]
  struct drm_device *dev = intel_dp_to_dev(intel_dp);
                     ^~~
drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_short_pulse’:
drivers/gpu/drm/i915/intel_dp.c:4337:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4339:1: error: version control conflict marker in file
 =======
 ^~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4341:1: error: version control conflict marker in file
 >>>>>>> drm/i915: sync dp link status checks against atomic commmits
 ^~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4343:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
  u8 old_sink_count = intel_dp->sink_count;
  ^~
drivers/gpu/drm/i915/intel_dp.c:4367:39: error: ‘sink_irq_vector’ undeclared (first use in this function)
      intel_dp_get_sink_irq(intel_dp, &sink_irq_vector) &&
                                       ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4380:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4383:22: error: ‘dev_priv’ undeclared (first use in this function)
  drm_modeset_unlock(&dev_priv->drm.mode_config.connection_mutex);
                      ^~~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4384:1: error: version control conflict marker in file
 =======
 ^~~~~~~
drivers/gpu/drm/i915/intel_dp.c:4387:1: error: version control conflict marker in file
 >>>>>>> drm/i915: sync dp link status checks against atomic commmits
 ^~~~~~~
drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_hpd_pulse’:
drivers/gpu/drm/i915/intel_dp.c:5136:28: error: ‘dev’ undeclared (first use in this function)
   iret = drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx);
                            ^~~
drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_short_pulse’:
drivers/gpu/drm/i915/intel_dp.c:4395:1: error: control reaches end of non-void function [-Werror=return-type]
 }
 ^
cc1: all warnings being treated as errors
scripts/Makefile.build:314: recipe for target 'drivers/gpu/drm/i915/intel_dp.o' failed
make[4]: *** [drivers/gpu/drm/i915/intel_dp.o] Error 1
scripts/Makefile.build:573: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:573: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:573: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1024: recipe for target 'drivers' failed
make: *** [drivers] Error 2