== Series Details == Series: Introduce Intel PXP component - Mesa single session (rev2) URL : https://patchwork.freedesktop.org/series/84620/ State : failure == Summary == Applying: drm/i915/pxp: Introduce Intel PXP component Applying: drm/i915/pxp: set KCR reg init during the boot time Applying: drm/i915/pxp: Implement funcs to create the TEE channel Applying: drm/i915/pxp: Create the arbitrary session after boot Applying: drm/i915/pxp: Func to send hardware session termination Applying: drm/i915/pxp: Enable PXP irq worker and callback stub Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_reg.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_debugfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0006 drm/i915/pxp: Enable PXP irq worker and callback stub 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
