error: patch failed: resolv/tst-resolv-short-response.c:33 error: resolv/tst-resolv-short-response.c: patch does not apply 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: Fix tst-resolv-short-response for older GCC (bug 32042) Patch failed at 0001 resolv: Fix tst-resolv-short-response for older GCC (bug 32042)