✗ Fi.CI.BUILD: failure for TRYBOT: ioctl cleanups (rev20)

Patchwork patchwork at emeril.freedesktop.org
Fri Jun 4 22:52:04 UTC 2021


== Series Details ==

Series: TRYBOT: ioctl cleanups (rev20)
URL   : https://patchwork.freedesktop.org/series/89135/
State : failure

== Summary ==

Applying: drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE
Applying: drm/i915: Stop storing the ring size in the ring pointer (v2)
Applying: drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP
Applying: drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem (v2)
Applying: drm/i915/gem: Return void from context_apply_all
Applying: drm/i915: Drop the CONTEXT_CLONE API (v2)
Applying: drm/i915: Implement SINGLE_TIMELINE with a syncobj (v4)
Applying: drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES
Applying: drm/i915/gem: Disallow bonding of virtual engines (v3)
Applying: drm/i915/gem: Remove engine auto-magic with FENCE_SUBMIT (v2)
Applying: drm/i915/request: Remove the hook from await_execution
Applying: drm/i915/gem: Disallow creating contexts with too many engines
Applying: drm/i915: Stop manually RCU banging in reset_stats_ioctl (v2)
Applying: drm/i915/gem: Add a separate validate_priority helper
Applying: drm/i915: Add gem/i915_gem_context.h to the docs
Applying: drm/i915/gem: Add an intermediate proto_context struct (v4)
Applying: SQUASH: - Create the default PPGTT in i915_gem_create_context
Applying: drm/i915/gem: Rework error handling in default_engines
Applying: drm/i915/gem: Optionally set SSEU in intel_context_set_gem
Applying: drm/i915: Add an i915_gem_vm_lookup helper
Applying: drm/i915/gem: Make an alignment check more sensible
Applying: drm/i915/gem: Use the proto-context to handle create parameters (v3)
Applying: SQUASH: - Don't allow more resetting user engines
Applying: SQUASH: - Rework initialization of UCONTEXT_PERSISTENCE
Applying: FIXUP: Only i915_vm_put if pc->vm != NULL
Applying: drm/i915/gem: Return an error ptr from context_lookup
Applying: drm/i915/gem: Delay context creation (v2)
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gem/i915_gem_context.c
M	drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_context.c
Patch failed at 0027 drm/i915/gem: Delay context creation (v2)
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".




More information about the Intel-gfx-trybot mailing list