On Tue, Dec 05, 2017 at 12:14:22AM +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915: Fix compilation (panel orientation x enum plane rename). > URL : https://patchwork.freedesktop.org/series/34876/ > State : failure > > == Summary == > > Applying: drm/i915: Fix compilation (panel orientation x enum plane rename). > error: Failed to merge in the changes. > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/intel_dsi.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/intel_dsi.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dsi.c > Patch failed at 0001 drm/i915: Fix compilation (panel orientation x enum plane rename). > 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". > Ouch! commit '82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")' is merged on drm-misc, not on drm-intel-next-queued. _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
