== Series Details == Series: drm/i915/gt: Locking splats PREEMPT_RT URL : https://patchwork.freedesktop.org/series/94480/ State : failure == Summary == Applying: drm/i915/gt: Queue and wait for the irq_work item. Applying: drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_execlists_submission.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_execlists_submission.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock() 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".
