== Series Details == Series: Initial support for small BAR recovery (rev3) URL : https://patchwork.freedesktop.org/series/99370/ State : failure == Summary == Applying: drm/i915: add io_size plumbing Applying: drm/i915/ttm: require mappable by default Applying: drm/i915: add I915_BO_ALLOC_GPU_ONLY Applying: drm/i915/buddy: track available visible size Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_ttm_buddy_manager.c M drivers/gpu/drm/i915/i915_ttm_buddy_manager.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_ttm_buddy_manager.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_ttm_buddy_manager.h Auto-merging drivers/gpu/drm/i915/i915_ttm_buddy_manager.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_ttm_buddy_manager.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/buddy: track available visible size 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".
