== Series Details == Series: Refactor drm_writeback_connector structure (rev7) URL : https://patchwork.freedesktop.org/series/152760/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/152760/revisions/7/mbox/ not applied Applying: drm: writeback: Refactor drm_writeback_connector structure Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c M drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c M drivers/gpu/drm/arm/malidp_mw.c M drivers/gpu/drm/drm_writeback.c M drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c M drivers/gpu/drm/vc4/vc4_txp.c M include/drm/drm_writeback.h Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_writeback.h CONFLICT (content): Merge conflict in include/drm/drm_writeback.h Auto-merging drivers/gpu/drm/vc4/vc4_txp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_txp.c Auto-merging drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c CONFLICT (content): Merge conflict in drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c Auto-merging drivers/gpu/drm/drm_writeback.c Auto-merging drivers/gpu/drm/arm/malidp_mw.c CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/malidp_mw.c Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 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: writeback: Refactor drm_writeback_connector structure 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
