== Series Details == Series: series starting with [1/5] drm/i915/gtt: Add read only pages to gen8_pte_encode (rev2) URL : https://patchwork.freedesktop.org/series/44776/ State : failure == Summary == Applying: drm/i915/gtt: Add read only pages to gen8_pte_encode Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_gtt.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c Applying: drm/i915/gtt: Read-only pages for insert_entries on bdw+ Applying: drm/i915: Prevent writing into a read-only object via a GGTT mmap Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_gem_gtt.c M drivers/gpu/drm/i915/selftests/i915_gem_context.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_context.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem_context.c Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c error: Failed to merge in the changes. Patch failed at 0003 drm/i915: Prevent writing into a read-only object via a GGTT mmap Use 'git am --show-current-patch' to see the failed 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
