== Series Details == Series: drm/i915: Init DDI ports based on port_mask (rev2) URL : https://patchwork.freedesktop.org/series/117641/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/117641/revisions/2/mbox/ not applied Applying: drm/i915: Remove bogus DDI-F from hsw/bdw output init Applying: drm/i915: Introduce device info port_mask Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_pci.c M drivers/gpu/drm/i915/intel_device_info.c M drivers/gpu/drm/i915/intel_device_info.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_device_info.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.h Auto-merging drivers/gpu/drm/i915/intel_device_info.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c Auto-merging drivers/gpu/drm/i915/i915_pci.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/i915: Introduce device info port_mask 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