On Fri, Dec 22, 2017 at 10:58:03PM +0000, Patchwork wrote: > == Series Details == > > Series: series starting with [01/11] drm/i915/cnl: Add Cannonlake PCI IDs for another SKU. > URL : https://patchwork.freedesktop.org/series/35744/ > State : failure > > == Summary == > > Applying: drm/i915/cnl: Add Cannonlake PCI IDs for another SKU. > Applying: drm/i915/cnl: Add Port F definition. > error: Failed to merge in the changes. > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/i915_drv.h Duh! I knew this conflict was comming, I acked the header changes, I tagged it this morning, but I forgot to rebase my patches from yesterday to today's drm-tip :/ > 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 > Patch failed at 0002 drm/i915/cnl: Add Port F definition. > The copy of the patch that failed is found in: .git/rebase-apply/patch > 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
