[Intel-gfx] ✗ Fi.CI.BAT: failure for Assorted compile warnings fixes

[Patchwork]

== Series Details ==

Series: Assorted compile warnings fixes
URL   : https://patchwork.freedesktop.org/series/33417/
State : failure

== Summary ==

IGT patchset build failed on latest successful build
9fe5a9a3de9e2ce345d5967a1e10a9a586b19836 tests/kms_fbcon_fbt: Report fbc_status on error

make  all-recursive
Making all in lib
make  all-recursive
Making all in .
Making all in tests
make[4]: Nothing to be done for 'all'.
Making all in man
make[2]: Nothing to be done for 'all'.
Making all in tools
Making all in null_state_gen
make[3]: Nothing to be done for 'all'.
Making all in registers
make[3]: Nothing to be done for 'all'.
  CC       aubdump.lo
aubdump.c: In function ‘dump_execbuffer2’:
aubdump.c:465:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
aubdump.c:467:1: error: version control conflict marker in file
 =======
 ^~~~~~~
aubdump.c:469:1: error: version control conflict marker in file
 >>>>>>> aubdump: Avoid mixing declarations and code
 ^~~~~~~
aubdump.c:410:6: warning: variable ‘batch_index’ set but not used [-Wunused-but-set-variable]
  int batch_index;
      ^~~~~~~~~~~
Makefile:1163: recipe for target 'aubdump.lo' failed
make[3]: *** [aubdump.lo] Error 1
Makefile:1211: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
Makefile:533: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
Makefile:465: recipe for target 'all' failed
make: *** [all] Error 2