✗ Fi.CI.BUILD: failure for i915/gem_concurrent_all: Add no-reloc

[Patchwork]

== Series Details ==

Series: i915/gem_concurrent_all: Add no-reloc
URL   : https://patchwork.freedesktop.org/series/99633/
State : failure

== Summary ==

Applying: DO_NOT_MERGE: lib/intel_batchbuffer: add tracking and reset for allocator
Using index info to reconstruct a base tree...
M	lib/igt_core.c
M	lib/intel_batchbuffer.c
M	lib/intel_batchbuffer.h
Falling back to patching base and 3-way merge...
Auto-merging lib/intel_batchbuffer.c
CONFLICT (content): Merge conflict in lib/intel_batchbuffer.c
Patch failed at 0001 DO_NOT_MERGE: lib/intel_batchbuffer: add tracking and reset for allocator
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".