[igt-dev] ✗ Fi.CI.BUILD: failure for tests/i915/i915_pm_dc: Add new dc9 test

[Patchwork]

== Series Details ==

Series: tests/i915/i915_pm_dc: Add new dc9 test
URL   : https://patchwork.freedesktop.org/series/107629/
State : failure

== Summary ==

Applying: tests/i915/i915_pm_dc: Add new dc9 test
Using index info to reconstruct a base tree...
M	lib/igt_pm.c
M	lib/igt_pm.h
Falling back to patching base and 3-way merge...
Auto-merging lib/igt_pm.h
CONFLICT (content): Merge conflict in lib/igt_pm.h
Auto-merging lib/igt_pm.c
CONFLICT (content): Merge conflict in lib/igt_pm.c
Patch failed at 0001 tests/i915/i915_pm_dc: Add new dc9 test
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".