✗ Fi.CI.BAT: failure for series starting with [1/4] drm: Add P010, P012, P016 format definitions and fourcc

[Patchwork]

== Series Details ==

Series: series starting with [1/4] drm: Add P010, P012, P016 format definitions and fourcc
URL   : https://patchwork.freedesktop.org/series/54650/
State : failure

== Summary ==

CALL    scripts/checksyscalls.sh
  DESCEND  objtool
  CHK     include/generated/compile.h
  CC [M]  drivers/gpu/drm/i915/intel_sprite.o
drivers/gpu/drm/i915/intel_sprite.c:1783:1: error: version control conflict marker in file
 <<<<<<< ours
 ^~~~~~~
drivers/gpu/drm/i915/intel_sprite.c:1805:2: error: ‘I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS’ undeclared here (not in a function); did you mean ‘I915_FORMAT_MOD_Y_TILED_CCS’?
  I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  I915_FORMAT_MOD_Y_TILED_CCS
drivers/gpu/drm/i915/intel_sprite.c:1806:2: error: ‘I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS’ undeclared here (not in a function); did you mean ‘I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS’?
  I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS
drivers/gpu/drm/i915/intel_sprite.c:1813:1: error: version control conflict marker in file
 >>>>>>> theirs
 ^~~~~~~
drivers/gpu/drm/i915/intel_sprite.c: In function ‘skl_universal_plane_create’:
drivers/gpu/drm/i915/intel_sprite.c:2097:13: error: ‘glk_planar_formats’ undeclared (first use in this function); did you mean ‘skl_planar_formats’?
   formats = glk_planar_formats;
             ^~~~~~~~~~~~~~~~~~
             skl_planar_formats
drivers/gpu/drm/i915/intel_sprite.c:2097:13: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/i915/intel_sprite.c:2097:11: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types]
   formats = glk_planar_formats;
           ^
In file included from ./include/linux/list.h:9:0,
                 from ./include/linux/agp_backend.h:33,
                 from ./include/drm/drmP.h:35,
                 from drivers/gpu/drm/i915/intel_sprite.c:32:
./include/linux/kernel.h:72:38: error: invalid operands to binary / (have ‘const uint64_t * {aka const long long unsigned int *}’ and ‘long unsigned int’)
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
                          ~           ^
drivers/gpu/drm/i915/intel_sprite.c:2098:17: note: in expansion of macro ‘ARRAY_SIZE’
   num_formats = ARRAY_SIZE(glk_planar_formats);
                 ^~~~~~~~~~
drivers/gpu/drm/i915/intel_sprite.c:2098:15: error: assignment makes integer from pointer without a cast [-Werror=int-conversion]
   num_formats = ARRAY_SIZE(glk_planar_formats);
               ^
drivers/gpu/drm/i915/intel_sprite.c:2111:15: error: ‘skl_plane_format_modifiers_noccs’ undeclared (first use in this function); did you mean ‘skl_plane_format_modifiers_ccs’?
   modifiers = skl_plane_format_modifiers_noccs;
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
               skl_plane_format_modifiers_ccs
cc1: all warnings being treated as errors
scripts/Makefile.build:291: recipe for target 'drivers/gpu/drm/i915/intel_sprite.o' failed
make[4]: *** [drivers/gpu/drm/i915/intel_sprite.o] Error 1
scripts/Makefile.build:516: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:516: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:516: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1055: recipe for target 'drivers' failed
make: *** [drivers] Error 2