[igt-dev] ✗ Fi.CI.BAT: failure for igt/tests: Fix error checking in kms_atomic_transition (rev2)

Patchwork
2019-02-15T16:44:25Z

== Series Details ==

Series: igt/tests: Fix error checking in kms_atomic_transition (rev2)
URL : https://patchwork.freedesktop.org/series/56617/
State : failure

== Summary ==

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