[igt-dev] ✗ Fi.CI.BUILD: failure for i915/perf_pmu: Exercise mixing perf reads into i915 mmaps

[Patchwork]

== Series Details ==

Series: i915/perf_pmu: Exercise mixing perf reads into i915 mmaps
URL   : https://patchwork.freedesktop.org/series/75421/
State : failure

== Summary ==

Applying: i915/perf_pmu: Exercise mixing perf reads into i915 mmaps
Using index info to reconstruct a base tree...
M	tests/perf_pmu.c
Falling back to patching base and 3-way merge...
Auto-merging tests/perf_pmu.c
CONFLICT (content): Merge conflict in tests/perf_pmu.c
Patch failed at 0001 i915/perf_pmu: Exercise mixing perf reads into i915 mmaps
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".