[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/3] Revert "tests/kms_dirtyfb: Add new test for dirtyfb ioctl"
Patchwork
patchwork at emeril.freedesktop.org
Tue Aug 8 15:51:31 UTC 2023
== Series Details ==
Series: series starting with [i-g-t,1/3] Revert "tests/kms_dirtyfb: Add new test for dirtyfb ioctl"
URL : https://patchwork.freedesktop.org/series/122156/
State : failure
== Summary ==
Applying: Revert "tests/kms_dirtyfb: Add new test for dirtyfb ioctl"
Using index info to reconstruct a base tree...
M tests/meson.build
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Revert "tests/i915/kms_frontbuffer_tracking: Split drrs into library"
Using index info to reconstruct a base tree...
M lib/meson.build
M tests/i915/kms_frontbuffer_tracking.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/kms_frontbuffer_tracking.c
CONFLICT (content): Merge conflict in tests/i915/kms_frontbuffer_tracking.c
Auto-merging lib/meson.build
CONFLICT (content): Merge conflict in lib/meson.build
Patch failed at 0002 Revert "tests/i915/kms_frontbuffer_tracking: Split drrs into library"
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