== Series Details == Series: drm/i915: Add drm_panic support (rev4) URL : https://patchwork.freedesktop.org/series/141935/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/141935/revisions/4/mbox/ not applied Applying: drm/i915/fbdev: Add intel_fbdev_get_map() Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_fb_pin.c M drivers/gpu/drm/i915/display/intel_fb_pin.h M drivers/gpu/drm/i915/display/intel_fbdev.c M drivers/gpu/drm/i915/display/intel_fbdev.h M drivers/gpu/drm/xe/display/xe_fb_pin.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbdev.h Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbdev.c Auto-merging drivers/gpu/drm/i915/display/intel_fb_pin.h Auto-merging drivers/gpu/drm/i915/display/intel_fb_pin.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/fbdev: Add intel_fbdev_get_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". Build failed, no error log produced
