[Intel-gfx] ✗ Fi.CI.BUILD: failure for RFC drm/i915: Expose union(class) utililisation

[Patchwork]

== Series Details ==

Series: RFC drm/i915: Expose union(class) utililisation
URL   : https://patchwork.freedesktop.org/series/85609/
State : failure

== Summary ==

Applying: RFC drm/i915: Expose union(class) utililisation
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_engine_cs.c
A	drivers/gpu/drm/i915/gt/intel_engine_stats.h
M	drivers/gpu/drm/i915/gt/intel_engine_types.h
M	drivers/gpu/drm/i915/gt/intel_engine_user.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_user.c
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_types.h
CONFLICT (modify/delete): drivers/gpu/drm/i915/gt/intel_engine_stats.h deleted in HEAD and modified in RFC drm/i915: Expose union(class) utililisation. Version RFC drm/i915: Expose union(class) utililisation of drivers/gpu/drm/i915/gt/intel_engine_stats.h left in tree.
Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine_cs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RFC drm/i915: Expose union(class) utililisation
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".