✗ Fi.CI.BUILD: failure for series starting with [v1,1/2] drm/dp: fix warning for target_rr_divide missing comment

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



== Series Details ==

Series: series starting with [v1,1/2] drm/dp: fix warning for target_rr_divide missing comment
URL   : https://patchwork.freedesktop.org/series/139881/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/139881/revisions/1/mbox/ not applied
Applying: drm/dp: fix warning for target_rr_divide missing comment
Using index info to reconstruct a base tree...
M	include/drm/display/drm_dp_helper.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/display/drm_dp_helper.h
CONFLICT (content): Merge conflict in include/drm/display/drm_dp_helper.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/dp: fix warning for target_rr_divide missing comment
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".
Build failed, no error log produced





[Index of Archives]     [AMD Graphics]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux