error: corrupt patch at line 14
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Applying: resolv.conf: implement ipv4+ipv6 flags (bug 30544)
Patch failed at 0001 resolv.conf: implement ipv4+ipv6 flags (bug 30544)