== Series Details == Series: Force preemption (rev2) URL : https://patchwork.freedesktop.org/series/40120/ State : failure == Summary == Applying: drm/i915/execlists: Refactor out complete_preempt_context() Applying: drm/i915: Add control flags to i915_handle_error() error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_drv.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gpu_error.h M drivers/gpu/drm/i915/i915_irq.c M drivers/gpu/drm/i915/i915_request.c M drivers/gpu/drm/i915/intel_hangcheck.c M drivers/gpu/drm/i915/selftests/intel_hangcheck.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_hangcheck.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hangcheck.c Patch failed at 0002 drm/i915: Add control flags to i915_handle_error() The copy of the patch that failed is found in: .git/rebase-apply/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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
