error: patch failed: Makeconfig:442 error: Makeconfig: patch does not apply error: patch failed: Makerules:587 error: Makerules: 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 set advice.mergeConflict false" Applying: Makeconfig: Support $(+nolink-deps) in link flags Patch failed at 0001 Makeconfig: Support $(+nolink-deps) in link flags