[Intel-gfx] ✗ Fi.CI.BAT: failure for GuC code restructuring and fixes (rev2)

[Patchwork]

== Series Details ==

Series: GuC code restructuring and fixes (rev2)
URL   : https://patchwork.freedesktop.org/series/30351/
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_drv.o
In file included from drivers/gpu/drm/i915/i915_drv.h:61:0,
                 from drivers/gpu/drm/i915/i915_drv.c:49:
drivers/gpu/drm/i915/intel_uc.h:35:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
drivers/gpu/drm/i915/intel_uc.h:94:1: error: version control conflict marker in file
 =======
 ^~~~~~~
drivers/gpu/drm/i915/intel_uc.h:105:42: error: ‘enum intel_uc_fw_status’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
                                          ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:105:61: error: parameter 1 (‘status’) has incomplete type
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
                                                             ^~~~~~
drivers/gpu/drm/i915/intel_uc.h:105:13: error: function declaration isn’t a prototype [-Werror=strict-prototypes]
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
             ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h: In function ‘intel_uc_fw_status_repr’:
drivers/gpu/drm/i915/intel_uc.h:108:7: error: ‘INTEL_UC_FIRMWARE_FAIL’ undeclared (first use in this function)
  case INTEL_UC_FIRMWARE_FAIL:
       ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:108:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/i915/intel_uc.h:110:7: error: ‘INTEL_UC_FIRMWARE_NONE’ undeclared (first use in this function)
  case INTEL_UC_FIRMWARE_NONE:
       ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:112:7: error: ‘INTEL_UC_FIRMWARE_PENDING’ undeclared (first use in this function)
  case INTEL_UC_FIRMWARE_PENDING:
       ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:114:7: error: ‘INTEL_UC_FIRMWARE_SUCCESS’ undeclared (first use in this function)
  case INTEL_UC_FIRMWARE_SUCCESS:
       ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h: At top level:
drivers/gpu/drm/i915/intel_uc.h:145:26: error: field ‘fetch_status’ has incomplete type
  enum intel_uc_fw_status fetch_status;
                          ^~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:146:26: error: field ‘load_status’ has incomplete type
  enum intel_uc_fw_status load_status;
                          ^~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:177:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
drivers/gpu/drm/i915/intel_uc.h:209:1: error: version control conflict marker in file
 =======
 ^~~~~~~
In file included from drivers/gpu/drm/i915/i915_drv.h:62:0,
                 from drivers/gpu/drm/i915/i915_drv.c:49:
drivers/gpu/drm/i915/intel_guc.h:135:19: error: redefinition of ‘guc_ggtt_offset’
 static inline u32 guc_ggtt_offset(struct i915_vma *vma)
                   ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/i915_drv.h:61:0,
                 from drivers/gpu/drm/i915/i915_drv.c:49:
drivers/gpu/drm/i915/intel_uc.h:201:19: note: previous definition of ‘guc_ggtt_offset’ was here
 static inline u32 guc_ggtt_offset(struct i915_vma *vma)
                   ^~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/i915_drv.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_drv.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