[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [2/2] drm/i915: Create vfuncs for the reset/enable/disable GuC functions (rev3)

[Patchwork]

== Series Details ==

Series: series starting with [2/2] drm/i915: Create vfuncs for the reset/enable/disable GuC functions (rev3)
URL   : https://patchwork.freedesktop.org/series/29251/
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_irq.o
drivers/gpu/drm/i915/i915_irq.c: In function ‘intel_irq_init’:
drivers/gpu/drm/i915/i915_irq.c:4168:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
drivers/gpu/drm/i915/i915_irq.c:4172:1: error: version control conflict marker in file
 =======
 ^~~~~~~
drivers/gpu/drm/i915/i915_irq.c:4176:1: error: version control conflict marker in file
 >>>>>>> drm/i915: Create vfuncs for the reset/enable/disable GuC functions
 ^~~~~~~
scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/i915_irq.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_irq.o] Error 1
scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1019: recipe for target 'drivers' failed
make: *** [drivers] Error 2