[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [01/37] drm/i915/gtt: Add read only pages to gen8_pte_encode (rev3)

[Patchwork]

== Series Details ==

Series: series starting with [01/37] drm/i915/gtt: Add read only pages to gen8_pte_encode (rev3)
URL   : https://patchwork.freedesktop.org/series/45638/
State : failure

== Summary ==

Applying: drm/i915/gtt: Add read only pages to gen8_pte_encode
Applying: drm/i915/gtt: Read-only pages for insert_entries on bdw+
Applying: drm/i915: Prevent writing into a read-only object via a GGTT mmap
Applying: drm/i915: Reject attempted pwrites into a read-only object
Applying: drm/i915/userptr: Enable read-only support on gen8+
Applying: drm/i915: Move rate-limiting request retire to after submission
Applying: drm/i915: Move engine request retirement to intel_engine_cs
Applying: drm/i915: Hold request reference for submission until retirement
Applying: drm/i915/execlists: Switch to rb_root_cached
Applying: drm/i915: Reserve some priority bits for internal use
Applying: drm/i915: Combine multiple internal plists into the same i915_priolist bucket
Applying: drm/i915: Priority boost for new clients
Applying: drm/i915: Priority boost switching to an idle ring
Applying: drm/i915: Refactor export_fence() after i915_vma_move_to_active()
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/selftests/i915_gem_context.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_context.c
Applying: drm/i915: Export i915_request_skip()
Applying: drm/i915: Start returning an error from i915_vma_move_to_active()
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/selftests/i915_gem_context.c
M	drivers/gpu/drm/i915/selftests/i915_gem_object.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_object.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem_object.c
Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
Patch failed at 0016 drm/i915: Start returning an error from i915_vma_move_to_active()
Use 'git am --show-current-patch' to see the failed 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".