[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/2] DO NOT MERGE: NV12 Experiment
Patchwork
patchwork at emeril.freedesktop.org
Thu May 11 08:10:20 UTC 2023
== Series Details ==
Series: series starting with [i-g-t,1/2] DO NOT MERGE: NV12 Experiment
URL : https://patchwork.freedesktop.org/series/117617/
State : failure
== Summary ==
Applying: DO NOT MERGE: NV12 Experiment
Using index info to reconstruct a base tree...
M tests/kms_pipe_crc_basic.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_pipe_crc_basic.c
CONFLICT (content): Merge conflict in tests/kms_pipe_crc_basic.c
Patch failed at 0001 DO NOT MERGE: NV12 Experiment
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