== Series Details == Series: Enable Gen 7 Observation Architecture (rev5) URL : https://patchwork.freedesktop.org/series/3024/ State : failure == Summary == Applying: drm/i915: Add i915 perf infrastructure Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/i915_drv.c M drivers/gpu/drm/i915/i915_drv.h M include/uapi/drm/i915_drm.h Falling back to patching base and 3-way merge... Auto-merging include/uapi/drm/i915_drm.h Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/i915/Makefile Applying: drm/i915: rename OACONTROL GEN7_OACONTROL Applying: drm/i915: return EACCES for check_cmd() failures Applying: drm/i915: don't whitelist oacontrol in cmd parser Applying: drm/i915: Add 'render basic' Haswell OA unit config Applying: drm/i915: Enable i915 perf stream for Haswell OA unit fatal: sha1 information is lacking or useless (drivers/gpu/drm/i915/i915_drv.h). error: could not build fake ancestor Patch failed at 0006 drm/i915: Enable i915 perf stream for Haswell OA unit 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
