✗ Fi.CI.BAT: failure for Refactor workarounds

[Patchwork]

== Series Details ==

Series: Refactor workarounds
URL   : https://patchwork.freedesktop.org/series/31406/
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_engine_cs.o
drivers/gpu/drm/i915/intel_engine_cs.c:818:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
drivers/gpu/drm/i915/intel_engine_cs.c: In function ‘gen8_init_workarounds’:
drivers/gpu/drm/i915/intel_engine_cs.c:838:17: error: implicit declaration of function ‘wa_add’ [-Werror=implicit-function-declaration]
   const int r = wa_add(dev_priv, (addr), (mask), (val)); \
                 ^
drivers/gpu/drm/i915/intel_engine_cs.c:844:2: note: in expansion of macro ‘WA_REG’
  WA_REG(addr, (mask), _MASKED_BIT_ENABLE(mask))
  ^~~~~~
drivers/gpu/drm/i915/intel_engine_cs.c:873:2: note: in expansion of macro ‘WA_SET_BIT_MASKED’
  WA_SET_BIT_MASKED(INSTPM, INSTPM_FORCE_ORDERING);
  ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_engine_cs.c: At top level:
drivers/gpu/drm/i915/intel_engine_cs.c:1498:1: error: version control conflict marker in file
 =======
 ^~~~~~~
drivers/gpu/drm/i915/intel_engine_cs.c: In function ‘intel_engine_is_idle’:
drivers/gpu/drm/i915/intel_engine_cs.c:1557:7: error: implicit declaration of function ‘ring_is_idle’ [-Werror=implicit-function-declaration]
  if (!ring_is_idle(engine))
       ^~~~~~~~~~~~
cc1: all warnings being treated as errors
scripts/Makefile.build:313: recipe for target 'drivers/gpu/drm/i915/intel_engine_cs.o' failed
make[4]: *** [drivers/gpu/drm/i915/intel_engine_cs.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:1019: recipe for target 'drivers' failed
make: *** [drivers] Error 2