== Series Details == Series: drm/i915/dp_mst: Fix MST state after a sink reset (rev2) URL : https://patchwork.freedesktop.org/series/136443/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/136443/revisions/2/mbox/ not applied Applying: drm/i915/dp_mst: Fix MST state after a sink reset Using index info to reconstruct a base tree... 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_dp_mst.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.h Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c Auto-merging drivers/gpu/drm/i915/display/intel_dp.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 drm/i915/dp_mst: Fix MST state after a sink reset 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
