== Series Details == Series: linux-next: manual merge of the drm tree with the drm-intel-fixes tree (rev3) URL : https://patchwork.freedesktop.org/series/71725/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/71725/revisions/3/mbox/ not applied Applying: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/display/intel_dmc_regs.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/display/intel_dmc_regs.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dmc_regs.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 linux-next: manual merge of the drm tree with the drm-intel-fixes tree 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".
