[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/tracing: Enable user interrupts while intel_engine_notify is active

[Patchwork]

== Series Details ==

Series: drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
URL   : https://patchwork.freedesktop.org/series/47897/
State : failure

== Summary ==

Applying: drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_trace.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_trace.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_trace.h
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915/tracing: Enable user interrupts while intel_engine_notify is active
Use 'git am --show-current-patch' to see the failed patch
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".