== Series Details == Series: Add basic support for flat-CCS bo evictions URL : https://patchwork.freedesktop.org/series/99248/ State : failure == Summary == Applying: drm/i915/flat-CCS: Add GEM bo structure fields for flat-CCS Applying: drm/i915/flat-CCS: Add flat CCS plane capabilities and modifiers Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_fb.c M drivers/gpu/drm/i915/display/intel_fb.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_fb.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fb.h Auto-merging drivers/gpu/drm/i915/display/intel_fb.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fb.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/flat-CCS: Add flat CCS plane capabilities and modifiers 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".
