== Series Details == Series: video, drm: constify fbops in struct fb_info (rev2) URL : https://patchwork.freedesktop.org/series/70119/ State : failure == Summary == Applying: video: fb_defio: preserve user fb_ops Applying: drm/fb-helper: don't preserve fb_ops across deferred IO use Applying: video: smscufx: don't restore fb_mmap after deferred IO cleanup Applying: video: udlfb: don't restore fb_mmap after deferred IO cleanup Applying: video: fbdev: vesafb: modify the static fb_ops directly Applying: video: fbmem: use const pointer for fb_ops Applying: video: omapfb: use const pointer for fb_ops Applying: video: fbdev: make fbops member of struct fb_info a const pointer Using index info to reconstruct a base tree... M include/linux/fb.h Falling back to patching base and 3-way merge... Auto-merging include/linux/fb.h CONFLICT (content): Merge conflict in include/linux/fb.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0008 video: fbdev: make fbops member of struct fb_info a const pointer 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
