On Tue, 21 Jan 2020, Patchwork wrote:
== Series Details ==
Series: conversion to struct drm_device logging macros.
URL : https://patchwork.freedesktop.org/series/72349/
State : failure
== Summary ==
Applying: drm/i915/dsi: conversion to struct drm_device log macros
Applying: drm/i915/ddi: convert to struct drm_device log macros.
Applying: drm/i915/power: convert to struct drm_device macros in display/intel_display_power.c
Applying: drm/i915/dp: conversion to struct drm_device logging macros.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_dp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.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/dp: conversion to struct drm_device logging macros.
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".
I'll send a v2 for this - from what I can tell one of the hunks changed
and can't apply cleanly.
Thanks,
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
