== Series Details == Series: series starting with [v2,1/2] drm/i915/dg2: Add preemption changes for Wa_14015141709 (rev2) URL : https://patchwork.freedesktop.org/series/101070/ State : failure == Summary == Applying: drm/i915/dg2: Add preemption changes for Wa_14015141709 Applying: drm/i915/dg2: Add debugfs to control global preemption setting Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/intel_gt.c M drivers/gpu/drm/i915/gt/intel_gt.h M drivers/gpu/drm/i915/gt/intel_gt_debugfs.c M drivers/gpu/drm/i915/gt/intel_gt_regs.h M drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c Auto-merging drivers/gpu/drm/i915/gt/intel_gt_regs.h Auto-merging drivers/gpu/drm/i915/gt/intel_gt_debugfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_debugfs.c Auto-merging drivers/gpu/drm/i915/gt/intel_gt.h Auto-merging drivers/gpu/drm/i915/gt/intel_gt.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/dg2: Add debugfs to control global preemption setting 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".
