== Series Details == Series: ICL GEM enabling (v2) (rev4) URL : https://patchwork.freedesktop.org/series/38174/ State : failure == Summary == Applying: drm/i915/icl: Add the ICL PCI IDs Applying: drm/i915/icl: add icelake_init_clock_gating() Applying: drm/i915/icl: Show interrupt registers in debugfs Applying: drm/i915/icl: Prepare for more rings Applying: drm/i915/icl: Interrupt handling Applying: drm/i915/icl: Ringbuffer interrupt handling Applying: drm/i915/icl: Correctly initialize the Gen11 engines Applying: drm/i915/icl: new context descriptor support Applying: drm/i915/icl: Enhanced execution list support Applying: drm/i915/icl: Add Indirect Context Offset for Gen11 Applying: drm/i915/icl: Gen11 forcewake support Applying: drm/i915/icl: Check for fused-off VDBOX and VEBOX instances Applying: drm/i915/icl: Enable the extra video decode and enhancement boxes for Icelake 11 Applying: drm/i915/icl: Update subslice define for ICL 11 Applying: drm/i915/icl: Added ICL 11 slice, subslice and EU fuse detection Applying: drm/i915/icl: Add reset control register changes Applying: drm/i915/icl: Add configuring MOCS in new Icelake engines Applying: drm/i915/icl: Split out the servicing of the Selector and Shared IIR registers error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_irq.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_irq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c Patch failed at 0018 drm/i915/icl: Split out the servicing of the Selector and Shared IIR registers 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
