[Intel-gfx] ✗ Fi.CI.BAT: failure for Preemption with GuC, third attempt

[Patchwork]

== Series Details ==

Series: Preemption with GuC, third attempt
URL   : https://patchwork.freedesktop.org/series/32320/
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/i915_guc_submission.o
drivers/gpu/drm/i915/i915_guc_submission.c: In function ‘i915_guc_submission_enable’:
drivers/gpu/drm/i915/i915_guc_submission.c:1182:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
drivers/gpu/drm/i915/i915_guc_submission.c:1185:1: error: version control conflict marker in file
 =======
 ^~~~~~~
At top level:
drivers/gpu/drm/i915/i915_guc_submission.c:1122:13: error: ‘i915_guc_submission_park’ defined but not used [-Werror=unused-function]
 static void i915_guc_submission_park(struct intel_engine_cs *engine)
             ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
scripts/Makefile.build:313: recipe for target 'drivers/gpu/drm/i915/i915_guc_submission.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_guc_submission.o] Error 1
scripts/Makefile.build:572: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:572: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:572: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1023: recipe for target 'drivers' failed
make: *** [drivers] Error 2

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6111/