✗ Fi.CI.BUILD: failure for series starting with [1/5] RELOC SQUASH v2
Patchwork
patchwork at emeril.freedesktop.org
Fri Aug 6 12:13:53 UTC 2021
== Series Details ==
Series: series starting with [1/5] RELOC SQUASH v2
URL : https://patchwork.freedesktop.org/series/93451/
State : failure
== Summary ==
Applying: RELOC SQUASH v2
Using index info to reconstruct a base tree...
M tests/i915/gem_exec_fence.c
M tests/i915/i915_module_load.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/i915_module_load.c
Auto-merging tests/i915/gem_exec_fence.c
CONFLICT (content): Merge conflict in tests/i915/gem_exec_fence.c
Patch failed at 0001 RELOC SQUASH v2
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 Intel-gfx-trybot
mailing list