== Series Details == Series: drm/i915: PREEMPT_RT related fixups. (rev7) URL : https://patchwork.freedesktop.org/series/95463/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/95463/revisions/7/mbox/ not applied Applying: drm/i915: Use preempt_disable/enable_rt() where recommended Applying: drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates Applying: drm/i915: Don't check for atomic context on PREEMPT_RT Applying: drm/i915: Disable tracing points on PREEMPT_RT Applying: drm/i915: skip DRM_I915_LOW_LEVEL_TRACEPOINTS with NOTRACE Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_display_trace.h M drivers/gpu/drm/i915/i915_trace.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_display_trace.h Applying: drm/i915/gt: Queue and wait for the irq_work item. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_breadcrumbs.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/intel_breadcrumbs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_breadcrumbs.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0006 drm/i915/gt: Queue and wait for the irq_work item. 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". Build failed, no error log produced
