== Series Details == Series: series starting with [1/4] drm/i915: Add distinct stubs for PM hibernation phases (rev4) URL : https://patchwork.freedesktop.org/series/7063/ State : failure
== Summary == Applying: drm/i915: Add distinct stubs for PM hibernation phases Applying: drm/i915: Update domain tracking for GEM objects on hibernation Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.c M drivers/gpu/drm/i915/i915_drv.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/gpu/drm/i915/i915_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c Patch failed at 0002 drm/i915: Update domain tracking for GEM objects on hibernation 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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
