[igt-dev] ✗ Fi.CI.BAT: failure for igt/gem_exec_schedule: Trim max number of contexts used (rev2)

Patchwork patchwork at emeril.freedesktop.org
Thu Mar 1 16:34:19 UTC 2018


== Series Details ==

Series: igt/gem_exec_schedule: Trim max number of contexts used (rev2)
URL   : https://patchwork.freedesktop.org/series/38143/
State : failure

== Summary ==

Applying: igt/gem_exec_schedule: Trim max number of contexts used
Using index info to reconstruct a base tree...
M	tests/gem_exec_schedule.c
Falling back to patching base and 3-way merge...
Auto-merging tests/gem_exec_schedule.c
CONFLICT (content): Merge conflict in tests/gem_exec_schedule.c
Patch failed at 0001 igt/gem_exec_schedule: Trim max number of contexts used
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".

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_913/issues.html


More information about the igt-dev mailing list