== Series Details == Series: 21st century intel_gpu_top URL : https://patchwork.freedesktop.org/series/50498/ State : failure == Summary == Applying: drm/i915/pmu: Fix enable count array size and bounds checking Applying: drm/i915: Keep a count of requests waiting for a slot on GPU Applying: drm/i915: Keep a count of requests submitted from userspace Applying: drm/i915/pmu: Add queued counter Applying: drm/i915/pmu: Add runnable counter Applying: drm/i915/pmu: Add running counter Applying: drm/i915: Store engine backpointer in the intel_context Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_context.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gem_context.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_context.h error: Failed to merge in the changes. Patch failed at 0007 drm/i915: Store engine backpointer in the intel_context Use 'git am --show-current-patch' to see the failed 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
