== Series Details == Series: spi: add driver for Intel discrete graphics (rev2) URL : https://patchwork.freedesktop.org/series/131763/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/131763/revisions/2/mbox/ not applied Applying: spi: add driver for intel graphics on-die spi device Applying: spi: intel-dg: implement region enumeration Applying: spi: intel-dg: implement spi access functions Applying: spi: intel-dg: spi register with mtd Applying: spi: intel-dg: implement mtd access handlers Applying: spi: intel-dg: align 64bit read and write Applying: spi: intel-dg: wake card on operations Applying: drm/i915/spi: add spi device for discrete graphics Applying: drm/i915/spi: add intel_spi_region map Applying: drm/i915/spi: add support for access mode Applying: drm/xe/spi: add on-die spi device Using index info to reconstruct a base tree... M drivers/gpu/drm/xe/Makefile M drivers/gpu/drm/xe/xe_device.c M drivers/gpu/drm/xe/xe_device_types.h M drivers/gpu/drm/xe/xe_pci.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/xe/xe_pci.c CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_pci.c Auto-merging drivers/gpu/drm/xe/xe_device_types.h CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h Auto-merging drivers/gpu/drm/xe/xe_device.c Auto-merging drivers/gpu/drm/xe/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0011 drm/xe/spi: add on-die spi 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". Build failed, no error log produced
