== Series Details == Series: fix dell wyse 3040 poweroff URL : https://patchwork.freedesktop.org/series/111987/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/111987/revisions/1/mbox/ not applied Applying: fix dell wyse 3040 poweroff Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_quirks.c M drivers/gpu/drm/i915/i915_driver.c M drivers/gpu/drm/i915/i915_drv.h Falling back to patching base and 3-way merge... 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 Auto-merging drivers/gpu/drm/i915/display/intel_quirks.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 fix dell wyse 3040 poweroff 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".
