== Series Details == Series: Fixes and worarounds for GuC issues (rev3) URL : https://patchwork.freedesktop.org/series/4694/ State : failure == Summary == Series 4694v3 Fixes and worarounds for GuC issues 2016-03-23T16:43:55.381802 http://patchwork.freedesktop.org/api/1.0/series/4694/revisions/3/mbox/ Applying: drm/i915/guc: Reset GuC and retry on firmware load failure Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_reg.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Patch failed at 0001 drm/i915/guc: Reset GuC and retry on firmware load failure _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
