[igt-dev] ✗ Fi.CI.BAT: failure for igt/tests: kms_plane_stress: Add plane stress test (rev13)

Patchwork
2019-08-19T15:17:47Z

== Series Details ==

Series: igt/tests: kms_plane_stress: Add plane stress test (rev13)
URL : https://patchwork.freedesktop.org/series/58524/
State : failure

== Summary ==

Applying: igt/tests: kms_plane_stress: Add plane stress test
Using index info to reconstruct a base tree...
M tests/Makefile.sources
M tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
CONFLICT (content): Merge conflict in tests/meson.build
Auto-merging tests/Makefile.sources
CONFLICT (content): Merge conflict in tests/Makefile.sources
Patch failed at 0001 igt/tests: kms_plane_stress: Add plane stress test
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".