✗ Fi.CI.BUILD: failure for tests/kms_plane_scaling: Cdclk exceeds max Cdclk issue fix (rev5)
Patchwork
patchwork at emeril.freedesktop.org
Tue Oct 15 09:44:20 UTC 2024
== Series Details ==
Series: tests/kms_plane_scaling: Cdclk exceeds max Cdclk issue fix (rev5)
URL : https://patchwork.freedesktop.org/series/139049/
State : failure
== Summary ==
Applying: tests/kms_plane_scaling: Add mode override in scaling test
Applying: tests/kms_plane_scaling: Improve error handling in kms_plane_scaling tests
Applying: HAX patch do not merge
Using index info to reconstruct a base tree...
M tests/intel-ci/xe-fast-feedback.testlist
Falling back to patching base and 3-way merge...
Auto-merging tests/intel-ci/xe-fast-feedback.testlist
CONFLICT (content): Merge conflict in tests/intel-ci/xe-fast-feedback.testlist
Patch failed at 0003 HAX patch do not merge
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