== Series Details == Series: Fix all typos in i915 (rev2) URL : https://patchwork.freedesktop.org/series/143146/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/143146/revisions/2/mbox/ not applied Applying: drm/i915/gt: fix typos in i915/gt files. Applying: drm/i915/gvt: fix typos in i915/gvt files Applying: drm/i915/gem: fix typos in i915/gem files Applying: drm/i915/pxp: fix typos in i915/pxp files Applying: drm/i915/selftests: fix typos in i915/selftests files Applying: drm/i915/soc: fix typos in i915/soc files Applying: drm/i915/display: fix typos in i915/display files Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/dvo_ns2501.c M drivers/gpu/drm/i915/display/icl_dsi.c M drivers/gpu/drm/i915/display/intel_cdclk.c M drivers/gpu/drm/i915/display/intel_crt.c M drivers/gpu/drm/i915/display/intel_ddi.c M drivers/gpu/drm/i915/display/intel_display_power.c M drivers/gpu/drm/i915/display/intel_display_types.h M drivers/gpu/drm/i915/display/intel_dp.c M drivers/gpu/drm/i915/display/intel_dp_mst.c M drivers/gpu/drm/i915/display/intel_dvo_dev.h M drivers/gpu/drm/i915/display/intel_hdcp.c M drivers/gpu/drm/i915/display/intel_pmdemand.c M drivers/gpu/drm/i915/display/intel_sdvo.c M drivers/gpu/drm/i915/display/skl_scaler.c M drivers/gpu/drm/i915/display/skl_watermark.c M drivers/gpu/drm/i915/display/vlv_dsi.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/vlv_dsi.c Auto-merging drivers/gpu/drm/i915/display/skl_watermark.c Auto-merging drivers/gpu/drm/i915/display/skl_scaler.c Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c Auto-merging drivers/gpu/drm/i915/display/intel_pmdemand.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_pmdemand.c Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c Auto-merging drivers/gpu/drm/i915/display/intel_dvo_dev.h Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c Auto-merging drivers/gpu/drm/i915/display/intel_dp.c Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c Auto-merging drivers/gpu/drm/i915/display/intel_crt.c Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c Auto-merging drivers/gpu/drm/i915/display/dvo_ns2501.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0007 drm/i915/display: fix typos in i915/display files 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
