== Series Details == Series: bits: Split asm and non-asm GENMASK*() and unify definitions (rev2) URL : https://patchwork.freedesktop.org/series/146626/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/146626/revisions/2/mbox/ not applied Applying: bits: split the definition of the asm and non-asm GENMASK*() Using index info to reconstruct a base tree... M include/linux/bits.h Falling back to patching base and 3-way merge... Auto-merging include/linux/bits.h CONFLICT (content): Merge conflict in include/linux/bits.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 bits: split the definition of the asm and non-asm GENMASK*() 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
