[Intel-gfx] ✗ Fi.CI.BAT: failure for Need to remove char pointers from trace events

[Patchwork]

== Series Details ==

Series: Need to remove char pointers from trace events
URL   : https://patchwork.freedesktop.org/series/63513/
State : failure

== Summary ==

Applying: Need to remove char pointers from trace events
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.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Need to remove char pointers from trace events
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".