✗ Fi.CI.BAT: failure for series starting with [1/8] drm/i915: Introduce the i915_user_extension_method

[Patchwork]

== Series Details ==

Series: series starting with [1/8] drm/i915: Introduce the i915_user_extension_method
URL   : https://patchwork.freedesktop.org/series/58405/
State : failure

== Summary ==

Applying: drm/i915: Introduce the i915_user_extension_method
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/Makefile
M	drivers/gpu/drm/i915/i915_utils.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
No changes -- Patch already applied.
Applying: drm/i915: Create/destroy VM (ppGTT) for use with contexts
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.c
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_gem_context.c
M	drivers/gpu/drm/i915/i915_gem_context.h
M	drivers/gpu/drm/i915/i915_gem_gtt.c
M	drivers/gpu/drm/i915/i915_gem_gtt.h
M	drivers/gpu/drm/i915/selftests/huge_pages.c
M	drivers/gpu/drm/i915/selftests/i915_gem_context.c
M	drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
M	drivers/gpu/drm/i915/selftests/mock_context.c
M	include/uapi/drm/i915_drm.h
Falling back to patching base and 3-way merge...
Auto-merging include/uapi/drm/i915_drm.h
CONFLICT (content): Merge conflict in include/uapi/drm/i915_drm.h
Auto-merging drivers/gpu/drm/i915/selftests/mock_context.c
Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Patch failed at 0002 drm/i915: Create/destroy VM (ppGTT) for use with contexts
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".