== Series Details == Series: i915: Add first set of DG2 PCI IDs URL : https://patchwork.freedesktop.org/series/103003/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/103003/revisions/1/mbox/ not applied Applying: i915: Add first set of DG2 PCI IDs 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 include/drm/i915_pciids.h Falling back to patching base and 3-way merge... Auto-merging include/drm/i915_pciids.h CONFLICT (content): Merge conflict in include/drm/i915_pciids.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 0001 i915: Add first set of DG2 PCI IDs 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".
