[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [01/13] drm/amdgpu: Provide ddc symlink in dm connector's sysfs directory
Patchwork
patchwork at emeril.freedesktop.org
Thu Aug 1 14:54:35 UTC 2019
== Series Details ==
Series: series starting with [01/13] drm/amdgpu: Provide ddc symlink in dm connector's sysfs directory
URL : https://patchwork.freedesktop.org/series/64510/
State : failure
== Summary ==
Applying: drm/amdgpu: Provide ddc symlink in dm connector's sysfs directory
Applying: drm/radeon: Eliminate possible use of an uninitialized variable
Using index info to reconstruct a base tree...
M drivers/gpu/drm/radeon/radeon_connectors.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/radeon/radeon_connectors.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_connectors.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 drm/radeon: Eliminate possible use of an uninitialized variable
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".
More information about the Intel-gfx
mailing list