== Series Details == Series: intel: sync i915_pciids.h with kernel URL : https://patchwork.freedesktop.org/series/78256/ State : failure == Summary == Applying: intel: sync i915_pciids.h with kernel Using index info to reconstruct a base tree... A intel/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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 intel: sync i915_pciids.h with kernel 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
