[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [PATCHv2,i-g-t,1/4] tests/kms_async_flips: Get rid of i915 specific fb creation (rev3)

[Patchwork]

== Series Details ==

Series: series starting with [PATCHv2,i-g-t,1/4] tests/kms_async_flips: Get rid of i915 specific fb creation (rev3)
URL   : https://patchwork.freedesktop.org/series/117954/
State : failure

== Summary ==

Applying: tests/kms_async_flips: Get rid of i915 specific fb creation
Applying: tests/kms_async_flips: Run the test for all outputs
Applying: tests/kms_async_flips: Split test_init()
Using index info to reconstruct a base tree...
M	tests/kms_async_flips.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_async_flips.c
CONFLICT (content): Merge conflict in tests/kms_async_flips.c
Patch failed at 0003 tests/kms_async_flips: Split test_init()
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".