== Series Details == Series: drm/i915: PREEMPT_RT related fixups. (rev4) URL : https://patchwork.freedesktop.org/series/95463/ State : failure == Summary == Applying: drm/i915: Drop the irqs_disabled() check 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() Applying: drm/i915: Use preempt_disable/enable_rt() where recommended Applying: drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_crtc.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_crtc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_crtc.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0005 drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates 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".
