[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,v2,1/2] tests/kms_atomic: Test cleanup
URL   : https://patchwork.freedesktop.org/series/109630/
State : failure

== Summary ==

Applying: tests/kms_atomic: Test cleanup
Using index info to reconstruct a base tree...
M	tests/kms_atomic.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_atomic.c
Applying: tests/kms_atomic: Convert tests to dynamic
Using index info to reconstruct a base tree...
M	tests/kms_atomic.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_atomic.c
CONFLICT (content): Merge conflict in tests/kms_atomic.c
Patch failed at 0002 tests/kms_atomic: Convert tests to dynamic
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".