== Series Details == Series: GuC HWCONFIG with documentation (rev6) URL : https://patchwork.freedesktop.org/series/99787/ State : failure == Summary == Applying: drm/i915/guc: Add fetch of hwconfig table Applying: drm/i915/uapi: Add query for hwconfig blob Applying: drm/i915/uapi: Add struct drm_i915_query_hwconfig_blob_item Applying: drm/i915/guc: Verify hwconfig blob matches supported format Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 drm/i915/guc: Verify hwconfig blob matches supported format 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".
