✗ Fi.CI.BUILD: failure for tests/kms_histogram: Added IGT support to validate global histogram (rev5)

[Patchwork]

== Series Details ==

Series: tests/kms_histogram: Added IGT support to validate global histogram (rev5)
URL   : https://patchwork.freedesktop.org/series/135789/
State : failure

== Summary ==

Applying: tests/kms_histogram: Added IGT support to validate global histogram
Using index info to reconstruct a base tree...
M	lib/igt_kms.c
M	lib/igt_kms.h
M	meson.build
Falling back to patching base and 3-way merge...
Auto-merging meson.build
Auto-merging lib/igt_kms.h
Auto-merging lib/igt_kms.c
CONFLICT (content): Merge conflict in lib/igt_kms.c
Patch failed at 0001 tests/kms_histogram: Added IGT support to validate global histogram
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".