✗ Fi.CI.BUILD: failure for New sharpness tool (rev2)

[Patchwork]

== Series Details ==

Series: New sharpness tool (rev2)
URL   : https://patchwork.freedesktop.org/series/138966/
State : failure

== Summary ==

Applying: data: Move PNG images to new data directory
Applying: runner/settings: Constify absolute_path parameter
Applying: runner/settings: Add function to set IGT_RUNNER_DATA environment variable
Applying: lib/igt_core: Enhance __igt_fopen_data to support additional directories
Applying: lib/igt_kms: Add "sharpness strength" as crtc property
Using index info to reconstruct a base tree...
M	lib/igt_kms.c
M	lib/igt_kms.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_kms.h
CONFLICT (content): Merge conflict in lib/igt_kms.h
Auto-merging lib/igt_kms.c
CONFLICT (content): Merge conflict in lib/igt_kms.c
Patch failed at 0005 lib/igt_kms: Add "sharpness strength" as crtc property
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".