On Wed, 05 Feb 2020, Patchwork <patchwork@xxxxxxxxxxxxxxxxxxxxxx> wrote: > == Series Details == > > Series: drm: Introduce struct drm_device based WARN* and use them in i915 (rev6) > URL : https://patchwork.freedesktop.org/series/72035/ > State : failure > > == Summary == > > Applying: drm/i915/display/cdclk: Make WARN* drm specific where drm_priv ptr is available > Applying: drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available > Applying: drm/i915/display/display: Make WARN* drm specific where drm_device ptr is available > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/display/intel_display.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/display/intel_display.c > Applying: drm/i915/display/power: Make WARN* drm specific where drm_priv ptr is available > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/display/intel_display_power.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0004 drm/i915/display/power: Make WARN* drm specific where drm_priv ptr is available > 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". Pankaj, please don't expect people to respond to your patches if they don't apply... BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
