[igt-dev] ✗ Fi.CI.BUILD: failure for tests/i915_pm_rps: Fix test after silent conflict

[Patchwork]

== Series Details ==

Series: tests/i915_pm_rps: Fix test after silent conflict
URL   : https://patchwork.freedesktop.org/series/120859/
State : failure

== Summary ==

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