[Intel-gfx] ✗ Ro.CI.BAT: failure for Enable i915 perf stream for Haswell OA unit (rev2)

[Patchwork]

== Series Details ==

Series: Enable i915 perf stream for Haswell OA unit (rev2)
URL   : https://patchwork.freedesktop.org/series/11295/
State : failure

== Summary ==

Applying: drm/i915: Add i915 perf infrastructure
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Makefile
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/i915_drv.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_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Auto-merging drivers/gpu/drm/i915/Makefile
Applying: drm/i915: rename OACONTROL GEN7_OACONTROL
Applying: drm/i915: return EACCES for check_cmd() failures
Applying: drm/i915: don't whitelist oacontrol in cmd parser
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_cmd_parser.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_cmd_parser.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_cmd_parser.c
error: Failed to merge in the changes.
Patch failed at 0004 drm/i915: don't whitelist oacontrol in cmd parser
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".