== Series Details == Series: series starting with [1/2] drm/i915/perf: Register sysctl path globally URL : https://patchwork.freedesktop.org/series/70906/ State : failure == Summary == Applying: drm/i915/perf: Register sysctl path globally Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_pci.c M drivers/gpu/drm/i915/i915_perf.c M drivers/gpu/drm/i915/i915_perf.h M drivers/gpu/drm/i915/i915_perf_types.h Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Introduce new macros for tracing Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_pm.c M drivers/gpu/drm/i915/gt/intel_context.c M drivers/gpu/drm/i915/gt/intel_context.h M drivers/gpu/drm/i915/gt/intel_engine.h M drivers/gpu/drm/i915/gt/intel_engine_cs.c M drivers/gpu/drm/i915/gt/intel_engine_pm.c M drivers/gpu/drm/i915/gt/intel_gt_pm.c M drivers/gpu/drm/i915/gt/intel_lrc.c M drivers/gpu/drm/i915/gt/intel_reset.c M drivers/gpu/drm/i915/gt/intel_ring_submission.c M drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c M drivers/gpu/drm/i915/i915_request.c M drivers/gpu/drm/i915/i915_request.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_request.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.h Auto-merging drivers/gpu/drm/i915/i915_request.c Auto-merging drivers/gpu/drm/i915/gt/intel_ring_submission.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_ring_submission.c Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c Auto-merging drivers/gpu/drm/i915/gt/intel_engine.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_engine.h Auto-merging drivers/gpu/drm/i915/gt/intel_context.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 drm/i915: Introduce new macros for tracing 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
