[igt-dev] ✗ Fi.CI.BUILD: failure for Introduce IGT allocator (rev34)
Patchwork
patchwork at emeril.freedesktop.org
Mon Apr 12 10:59:40 UTC 2021
== Series Details ==
Series: Introduce IGT allocator (rev34)
URL : https://patchwork.freedesktop.org/series/82954/
State : failure
== Summary ==
Applying: lib/igt_list: Add igt_list_del_init()
Applying: lib/igt_list: Add igt_list_for_each_entry_safe_reverse
Applying: lib/igt_map: Adopt Mesa hash table
Using index info to reconstruct a base tree...
A lib/Makefile.sources
M lib/meson.build
Falling back to patching base and 3-way merge...
Auto-merging lib/meson.build
CONFLICT (modify/delete): lib/Makefile.sources deleted in HEAD and modified in lib/igt_map: Adopt Mesa hash table. Version lib/igt_map: Adopt Mesa hash table of lib/Makefile.sources left in tree.
Patch failed at 0003 lib/igt_map: Adopt Mesa hash table
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".
More information about the igt-dev
mailing list