== Series Details == Series: drm/i915: Remove obj->mm.lock! (rev17) URL : https://patchwork.freedesktop.org/series/82337/ State : failure == Summary == Applying: drm/i915: Do not share hwsp across contexts any more, v7. Applying: drm/i915: Pin timeline map after first timeline pin, v3. Applying: drm/i915: Move cmd parser pinning to execbuffer Applying: drm/i915: Add missing -EDEADLK handling to execbuf pinning, v2. Applying: drm/i915: Ensure we hold the object mutex in pin correctly. Applying: drm/i915: Add gem object locking to madvise. Applying: drm/i915: Move HAS_STRUCT_PAGE to obj->flags Applying: drm/i915: Rework struct phys attachment handling Applying: drm/i915: Convert i915_gem_object_attach_phys() to ww locking, v2. Applying: drm/i915: make lockdep slightly happier about execbuf. Applying: drm/i915: Disable userptr pread/pwrite support. Applying: drm/i915: No longer allow exporting userptr through dma-buf Applying: drm/i915: Reject more ioctls for userptr, v2. Applying: drm/i915: Reject UNSYNCHRONIZED for userptr, v2. Applying: drm/i915: Make compilation of userptr code depend on MMU_NOTIFIER. Applying: drm/i915: Fix userptr so we do not have to worry about obj->mm.lock, v7. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c M drivers/gpu/drm/i915/gem/i915_gem_userptr.c M drivers/gpu/drm/i915/i915_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_userptr.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0016 drm/i915: Fix userptr so we do not have to worry about obj->mm.lock, v7. 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
