[igt-dev] ✗ Fi.CI.BUILD: failure for Add IGT support for Bigjoiner (rev23)

[Patchwork]

== Series Details ==

Series: Add IGT support for Bigjoiner (rev23)
URL   : https://patchwork.freedesktop.org/series/108183/
State : failure

== Summary ==

Applying: lib/igt_kms: Add a helper for valid pipe/output constraint
Applying: lib/igt_kms: Bigjoiner check in max_bpc constraint
Applying: tests/kms_async_flips: Add support for Bigjoiner
Applying: tests/kms_atomic: Add support for Bigjoiner
Applying: tests/kms_atomic_interruptible: Add support for Bigjoiner
Applying: tests/kms_atomic_transition: Add support for Bigjoiner
Applying: tests/kms_color_helper: Helper to check Bigjoiner constraint
Applying: tests/kms_color: Add support for Bigjoiner
Applying: tests/chamelium/kms_color_chamelium: Add support for Bigjoiner
Applying: tests/kms_content_protection: Add support for Bigjoiner
Applying: tests/kms_concurrent: Add support for Bigjoiner
Applying: tests/kms_cursor_crc: Add support for Bigjoiner
Applying: tests/kms_cursor_edge_walk: Add support for Bigjoiner
Applying: tests/kms_cursor_legacy: Add support for Bigjoiner
Applying: tests/kms_display_modes: Add support for Bigjoiner
Applying: tests/kms_dp_tiled_display: Add support for Bigjoiner
Applying: tests/kms_flip_event_leak: Add support for Bigjoiner
Applying: tests/kms_invalid_mode: Add support for Bigjoiner
Applying: tests/kms_lease: Add support for Bigjoiner
Applying: tests/kms_pipe_crc_basic: Add support for Bigjoiner
Applying: tests/kms_plane: Add support for Bigjoiner
Applying: tests/kms_plane_alpha_blend: Add support for Bigjoiner
Applying: tests/kms_plane_cursor: Add support for Bigjoiner
Applying: tests/kms_plane_lowres: Add support for Bigjoiner
Applying: tests/kms_plane_multiple: Add support for Bigjoiner
Applying: tests/kms_plane_scaling: Add support for Bigjoiner
Using index info to reconstruct a base tree...
M	tests/kms_plane_scaling.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_plane_scaling.c
CONFLICT (content): Merge conflict in tests/kms_plane_scaling.c
Patch failed at 0026 tests/kms_plane_scaling: Add support for Bigjoiner
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".