✗ Fi.CI.BUILD: failure for tests/intel/kms_joiner: switch modeset from uj to bj and vice-versa (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Fri Sep 27 14:58:25 UTC 2024
== Series Details ==
Series: tests/intel/kms_joiner: switch modeset from uj to bj and vice-versa (rev2)
URL : https://patchwork.freedesktop.org/series/138525/
State : failure
== Summary ==
Applying: tests/intel/kms_joiner: switch modeset from uj to bj and vice-versa
Using index info to reconstruct a base tree...
A tests/intel/kms_joiner.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/kms_big_joiner.c
CONFLICT (content): Merge conflict in tests/intel/kms_big_joiner.c
Patch failed at 0001 tests/intel/kms_joiner: switch modeset from uj to bj and vice-versa
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