[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915: change to_mock() to an inline function

[Patchwork]

== Series Details ==

Series: series starting with [1/2] drm/i915: change to_mock() to an inline function
URL   : https://patchwork.freedesktop.org/series/69169/
State : failure

== Summary ==

Applying: drm/i915: change to_mock() to an inline function
Applying: drm/i915: make more headers self-contained
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/selftests/mock_drm.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/mock_drm.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_drm.h
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: make more headers self-contained
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".