== Series Details ==

Series: tests/gem_exec_fence: test that in-fence is not overwritten
URL   : https://patchwork.freedesktop.org/series/38283/
State : failure

== Summary ==

Applying: tests/gem_exec_fence: test that in-fence is not overwritten
Using index info to reconstruct a base tree...
M       tests/gem_exec_fence.c
Falling back to patching base and 3-way merge...
Auto-merging tests/gem_exec_fence.c
CONFLICT (content): Merge conflict in tests/gem_exec_fence.c
Patch failed at 0001 tests/gem_exec_fence: test that in-fence is not overwritten
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to