[igt-dev] ✗ Fi.CI.BUILD: failure for Add XE suppor for display tests (rev4)

[Patchwork]

== Series Details ==

Series: Add XE suppor for display tests (rev4)
URL   : https://patchwork.freedesktop.org/series/119525/
State : failure

== Summary ==

Applying: lib: Add tiling support for XE
Applying: tests/kms_cursor_edge_walk: Fix intel specific checks
Applying: tests/kms_getfb: Extended ccs tests to support XE
Applying: tests/kms_addfb_basic: Add tiling support for XE
Applying: tests/kms_plane: Add tiling support for XE
Using index info to reconstruct a base tree...
M	tests/kms_plane.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_plane.c
CONFLICT (content): Merge conflict in tests/kms_plane.c
Patch failed at 0005 tests/kms_plane: Add tiling support for XE
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".