== Series Details == Series: series starting with [1/6] zsmalloc: switch from alloc_vm_area to get_vm_area URL : https://patchwork.freedesktop.org/series/81855/ State : failure == Summary == Applying: zsmalloc: switch from alloc_vm_area to get_vm_area Applying: mm: add a vmap_pfn function Applying: drm/i915: use vmap in shmem_pin_map Applying: drm/i915: use vmap in i915_gem_object_map Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/gem/i915_gem_pages.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gem/i915_gem_pages.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pages.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 drm/i915: use vmap in i915_gem_object_map 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
