== Series Details == Series: drm/i915: Audio fastset, and some fixes (rev2) URL : https://patchwork.freedesktop.org/series/126041/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/126041/revisions/2/mbox/ not applied Applying: drm/i915: Check pipe active state in {planes, vrr}_{enabling, disabling}() Applying: drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled Applying: drm/i915: Polish some RMWs Applying: drm/i915: Push audio enable/disable further out Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_ddi.c M drivers/gpu/drm/i915/display/intel_dp_mst.c Falling back to patching base and 3-way merge... 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_ddi.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 drm/i915: Push audio enable/disable further out 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
