== Series Details == Series: series starting with [CI,1/2] drm/i915: Add smp_rmb() to busy ioctl's RCU dance URL : https://patchwork.freedesktop.org/series/10828/ State : failure == Summary == Applying: drm/i915: Add smp_rmb() to busy ioctl's RCU dance Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem.c M drivers/gpu/drm/i915/i915_gem_request.h Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm/i915: Do not overwrite the request with zero on reallocation Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_request.c M drivers/gpu/drm/i915/i915_gem_request.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gem_request.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_request.c error: Failed to merge in the changes. Patch failed at 0002 drm/i915: Do not overwrite the request with zero on reallocation The copy of the patch that failed is found in: .git/rebase-apply/patch 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
