== Series Details == Series: drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type (rev2) URL : https://patchwork.freedesktop.org/series/128095/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/128095/revisions/2/mbox/ not applied Applying: drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type Using index info to reconstruct a base tree... 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 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type 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
