== Series Details == Series: ALSA: hda/i915 - avoid hung task timeout in i915 wait (rev2) URL : https://patchwork.freedesktop.org/series/101156/ State : failure == Summary == Applying: ALSA: hda/i915 - avoid hung task timeout in i915 wait Using index info to reconstruct a base tree... M sound/hda/hdac_i915.c Falling back to patching base and 3-way merge... Auto-merging sound/hda/hdac_i915.c CONFLICT (content): Merge conflict in sound/hda/hdac_i915.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 ALSA: hda/i915 - avoid hung task timeout in i915 wait 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".
