== Series Details == Series: series starting with [01/11] drm/i915: Revoke mmaps and prevent access to fence registers across reset (rev3) URL : https://patchwork.freedesktop.org/series/55956/ State : failure == Summary == Applying: drm/i915: Revoke mmaps and prevent access to fence registers across reset Applying: drm/i915/execlists: Suppress redundant preemption Applying: drm/i915/selftests: Exercise some AB...BA preemption chains Applying: drm/i915: Generalise GPU activity tracking Applying: drm/i915: Add timeline barrier support Applying: drm/i915: Allocate active tracking nodes from a slabcache Applying: drm/i915: Pull i915_gem_active into the i915_active family Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_active.c M drivers/gpu/drm/i915/i915_active.h M drivers/gpu/drm/i915/i915_active_types.h M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/i915_gem_gtt.c M drivers/gpu/drm/i915/i915_vma.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_vma.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_active_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_active_types.h Auto-merging drivers/gpu/drm/i915/i915_active.h Auto-merging drivers/gpu/drm/i915/i915_active.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_active.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0007 drm/i915: Pull i915_gem_active into the i915_active family 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
