[Intel-gfx] ✗ Fi.CI.BUILD: failure for Explicity steer l3bank multicast reads when necessary (rev6)

Patchwork
2021-06-17T21:07:51Z

Series: Explicity steer l3bank multicast reads when necessary (rev6)
URL : https://patchwork.freedesktop.org/series/91485/
State : failure

== Summary ==

Applying: drm/i915: extract steered reg access to common function
Applying: drm/i915: Add GT support for multiple types of multicast steering
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_gt.c
M drivers/gpu/drm/i915/gt/intel_gt_types.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_gt_types.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_types.h
Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915: Add GT support for multiple types of multicast steering
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".