[igt-dev] ✗ Fi.CI.BUILD: failure for series starting with [i-g-t,1/3] lib/igt_sysfs: Add helpers to iterate over GTs (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/3] lib/igt_sysfs: Add helpers to iterate over GTs (rev2)
URL   : https://patchwork.freedesktop.org/series/102664/
State : failure

== Summary ==

Applying: lib/igt_sysfs: Add helpers to iterate over GTs
Applying: tests/i915_pm_disag_freq: New test for media freq factor
Applying: tests/i915_pm_disag_freq: New test for media freq factor
Using index info to reconstruct a base tree...
M	tests/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in tests/i915/i915_pm_disag_freq.c
Auto-merging tests/i915/i915_pm_disag_freq.c
Patch failed at 0003 tests/i915_pm_disag_freq: New test for media freq factor
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".