[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [CI,1/4] drm/i915/perf: introduce a versioning of the i915-perf uapi

[Patchwork]

== Series Details ==

Series: series starting with [CI,1/4] drm/i915/perf: introduce a versioning of the i915-perf uapi
URL   : https://patchwork.freedesktop.org/series/67990/
State : failure

== Summary ==

Applying: drm/i915/perf: introduce a versioning of the i915-perf uapi
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_getparam.c
M	drivers/gpu/drm/i915/i915_perf.c
M	drivers/gpu/drm/i915/i915_perf.h
M	include/uapi/drm/i915_drm.h
Falling back to patching base and 3-way merge...
Auto-merging include/uapi/drm/i915_drm.h
Auto-merging drivers/gpu/drm/i915/i915_perf.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_perf.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915/perf: introduce a versioning of the i915-perf uapi
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".