== Series Details == Series: Introduce CAP_SYS_PERFMON to secure system performance monitoring and observability (rev2) URL : https://patchwork.freedesktop.org/series/70961/ State : failure == Summary == Applying: capabilities: introduce CAP_SYS_PERFMON to kernel and user space Applying: perf/core: open access for CAP_SYS_PERFMON privileged process Applying: perf tool: extend Perf tool with CAP_SYS_PERFMON capability support Applying: drm/i915/perf: open access for CAP_SYS_PERFMON privileged process Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_perf.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_perf.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_perf.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0004 drm/i915/perf: open access for CAP_SYS_PERFMON privileged process 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
