== Series Details == Series: series starting with [2/2] drm/i915: Allow disabling error capture (rev3) URL : https://patchwork.freedesktop.org/series/13576/ State : failure == Summary == Applying: drm/i915: Allow disabling error capture Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Kconfig M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/i915_debugfs.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_gpu_error.c M drivers/gpu/drm/i915/i915_params.c M drivers/gpu/drm/i915/i915_params.h M drivers/gpu/drm/i915/i915_sysfs.c M drivers/gpu/drm/i915/intel_display.c M drivers/gpu/drm/i915/intel_overlay.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_sysfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_sysfs.c Auto-merging drivers/gpu/drm/i915/i915_params.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_params.h Auto-merging drivers/gpu/drm/i915/i915_params.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_params.c Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c Auto-merging drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_debugfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c Auto-merging drivers/gpu/drm/i915/Makefile CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile Auto-merging drivers/gpu/drm/i915/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig error: Failed to merge in the changes. Patch failed at 0001 drm/i915: Allow disabling error capture 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
