On Sat, Nov 30, 2024 at 11:57:47PM +0000, Patchwork wrote: > == Series Details == > > Series: drm/connector: add eld_mutex to protect connector->eld > URL : https://patchwork.freedesktop.org/series/141958/ > State : failure > > == Summary == > > Error: patch https://patchwork.freedesktop.org/api/1.0/series/141958/revisions/1/mbox/ not applied > Applying: drm/connector: add mutex to protect ELD from concurrent access > Applying: drm/bridge: anx7625: use eld_mutex to protect access to connector->eld > Applying: drm/bridge: ite-it66121: use eld_mutex to protect access to connector->eld > Applying: drm/amd/display: use eld_mutex to protect access to connector->eld > Applying: drm/exynos: hdmi: use eld_mutex to protect access to connector->eld > Applying: drm/i915/audio: use eld_mutex to protect access to connector->eld > Applying: drm/msm/dp: use eld_mutex to protect access to connector->eld > Using index info to reconstruct a base tree... > M drivers/gpu/drm/msm/dp/dp_audio.c Okay... I see. I branched off drm-misc-next, but drm/msm has changed since the last merge point. I'll wait for drm-misc-next to be updated in linux-next before reposting the series. The rest of the code can still be reviewed normally. > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/msm/dp/dp_audio.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dp/dp_audio.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch=diff' to see the failed patch > Patch failed at 0007 drm/msm/dp: use eld_mutex to protect access to connector->eld > 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 > > -- With best wishes Dmitry
