[Intel-gfx] ✗ Fi.CI.BAT: failure for scripts/trace.pl: Rudimentary preemption support

[Patchwork]

== Series Details ==

Series: scripts/trace.pl: Rudimentary preemption support
URL   : https://patchwork.freedesktop.org/series/35618/
State : failure

== Summary ==

Applying: scripts/trace.pl: Rudimentary preemption support
Using index info to reconstruct a base tree...
M	scripts/trace.pl
Falling back to patching base and 3-way merge...
Auto-merging scripts/trace.pl
CONFLICT (content): Merge conflict in scripts/trace.pl
Patch failed at 0001 scripts/trace.pl: Rudimentary preemption support
The copy of the patch that failed is found in: .git/rebase-apply/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".