== Series Details == Series: series starting with [v2] drm/i915: Enable render context support for Ironlake (gen5) (rev2) URL : https://patchwork.freedesktop.org/series/34315/ State : failure == Summary == Applying: drm/i915: Enable render context support for Ironlake (gen5) Applying: drm/i915: Enable render context support for gen4 (Broadwater to Cantiga) Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_engine_cs.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c Patch failed at 0002 drm/i915: Enable render context support for gen4 (Broadwater to Cantiga) Current HEAD: commit b407e5f38397c0c22b5056a1664753287993b152 Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Date: Thu Nov 23 16:15:35 2017 +0000 drm-tip: 2017y-11m-23d-16h-14m-59s UTC integration manifest _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
