[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,v2,1/2] tests/i915/kms_big_fb: Add Cairo fallback path for test image creation
Patchwork
patchwork at emeril.freedesktop.org
Wed Jun 28 14:32:28 UTC 2023
== Series Details ==
Series: series starting with [i-g-t,v2,1/2] tests/i915/kms_big_fb: Add Cairo fallback path for test image creation
URL : https://patchwork.freedesktop.org/series/119977/
State : failure
== Summary ==
Applying: tests/i915/kms_big_fb: Add Cairo fallback path for test image creation
Using index info to reconstruct a base tree...
M tests/i915/kms_big_fb.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/kms_big_fb.c
CONFLICT (content): Merge conflict in tests/i915/kms_big_fb.c
Patch failed at 0001 tests/i915/kms_big_fb: Add Cairo fallback path for test image creation
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".
More information about the igt-dev
mailing list