[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915: Show the logical context ring state on dumping (rev3)

[Patchwork]

== Series Details ==

Series: series starting with [1/2] drm/i915: Show the logical context ring state on dumping (rev3)
URL   : https://patchwork.freedesktop.org/series/66422/
State : failure

== Summary ==

Applying: drm/i915: Show the logical context ring state on dumping
Applying: drm/i915/selftests: Verify the LRC register layout between init and HW
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_lrc.c
M	drivers/gpu/drm/i915/gt/intel_lrc_reg.h
M	drivers/gpu/drm/i915/gt/selftest_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc_reg.h
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 drm/i915/selftests: Verify the LRC register layout between init and HW
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".