== Series Details == Series: Reclassify messages from GuC loader/submission (rev2) URL : https://patchwork.freedesktop.org/series/10918/ State : failure == Summary == Applying: drm: extra printk() wrapper macros Applying: drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN() Applying: drm/i915/guc: revisit GuC loader message levels Applying: NOMERGE: next version of GuC firmware is 8.11 Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_guc_loader.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_guc_loader.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_guc_loader.c error: Failed to merge in the changes. Patch failed at 0004 NOMERGE: next version of GuC firmware is 8.11 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
