== Series Details == Series: series starting with [CI,1/4] drm/i915/display/tgl+: Set default values for all registers in PIPE_MBUS_DBOX_CTL URL : https://patchwork.freedesktop.org/series/101961/ State : failure == Summary == Applying: drm/i915/display/tgl+: Set default values for all registers in PIPE_MBUS_DBOX_CTL Applying: drm/i915/display/adlp: Adjust MBUS DBOX BW and B credits Applying: drm/i915/display: Add HAS_MBUS_JOINING Using index info to reconstruct a base tree... 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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0003 drm/i915/display: Add HAS_MBUS_JOINING 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".
