== Series Details == Series: Introduce Intel PXP (rev5) URL : https://patchwork.freedesktop.org/series/86798/ State : failure == Summary == Applying: drm/i915/pxp: Define PXP component interface Applying: mei: pxp: export pavp client to me client bus Applying: drm/i915/pxp: define PXP device flag and kconfig Applying: drm/i915/pxp: allocate a vcs context for pxp usage Applying: drm/i915/pxp: Implement funcs to create the TEE channel Applying: drm/i915/pxp: set KCR reg init Applying: drm/i915/pxp: Create the arbitrary session after boot Applying: drm/i915/pxp: Implement arb session teardown Applying: drm/i915/pxp: Implement PXP irq handler Applying: drm/i915/pxp: Enable PXP power management Applying: drm/i915/pxp: interface for marking contexts as using protected content Applying: drm/i915/uapi: introduce drm_i915_gem_create_ext Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.c M include/uapi/drm/i915_drm.h Falling back to patching base and 3-way merge... Auto-merging include/uapi/drm/i915_drm.h CONFLICT (content): Merge conflict in include/uapi/drm/i915_drm.h Auto-merging drivers/gpu/drm/i915/i915_drv.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0012 drm/i915/uapi: introduce drm_i915_gem_create_ext 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
