✗ Fi.CI.BUILD: failure for New subtest for CMRR (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Mon Jun 3 07:12:53 UTC 2024
== Series Details ==
Series: New subtest for CMRR (rev2)
URL : https://patchwork.freedesktop.org/series/126639/
State : failure
== Summary ==
Applying: tests/kms_vrr: Add support to read Vblank event
Applying: tests/kms_vrr: New subtest for CMRR
Using index info to reconstruct a base tree...
M tests/kms_vrr.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_vrr.c
CONFLICT (content): Merge conflict in tests/kms_vrr.c
Patch failed at 0002 tests/kms_vrr: New subtest for CMRR
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