== Series Details == Series: Add driver for GSC controller (rev2) URL : https://patchwork.freedesktop.org/series/98066/ State : failure == Summary == Applying: drm/i915/gsc: add gsc as a mei auxiliary device 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/gt/intel_gt.c M drivers/gpu/drm/i915/gt/intel_gt.h M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_pci.c M drivers/gpu/drm/i915/i915_reg.h M drivers/gpu/drm/i915/intel_device_info.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_device_info.h Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_pci.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/gt/intel_gt.h Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c Auto-merging 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. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/gsc: add gsc as a mei auxiliary device 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".
