== Series Details == Series: mtd: add driver for Intel discrete graphics (rev12) URL : https://patchwork.freedesktop.org/series/140306/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/140306/revisions/12/mbox/ not applied Applying: mtd: add driver for intel graphics non-volatile memory device Applying: mtd: intel-dg: implement region enumeration Applying: mtd: intel-dg: implement access functions Applying: mtd: intel-dg: register with mtd Applying: mtd: intel-dg: align 64bit read and write Applying: drm/i915/nvm: add nvm device for discrete graphics Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_driver.c M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_reg.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_reg.h 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_driver.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0006 drm/i915/nvm: add nvm device for discrete graphics 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
