[igt-dev] ✗ Fi.CI.BUILD: failure for Introduce IGT allocator (rev37)

[Patchwork]

== Series Details ==

Series: Introduce IGT allocator (rev37)
URL   : https://patchwork.freedesktop.org/series/82954/
State : failure

== Summary ==

Applying: lib/igt_list: Add igt_list_del_init()
Using index info to reconstruct a base tree...
M	lib/igt_list.c
M	lib/igt_list.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_list.h
No changes -- Patch already applied.
Applying: lib/igt_list: Add igt_list_for_each_entry_safe_reverse
Using index info to reconstruct a base tree...
M	lib/igt_list.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: lib/igt_map: Adopt Mesa hash table
Using index info to reconstruct a base tree...
M	docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
M	lib/meson.build
Falling back to patching base and 3-way merge...
Auto-merging lib/meson.build
Auto-merging docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml
No changes -- Patch already applied.
Applying: lib/igt_core: Track child process pid and tid
Using index info to reconstruct a base tree...
M	lib/igt_core.c
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_core.c
No changes -- Patch already applied.
Applying: lib/intel_allocator_simple: Add simple allocator
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in lib/intel_allocator_simple.c
Auto-merging lib/intel_allocator_simple.c
Patch failed at 0005 lib/intel_allocator_simple: Add simple 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".