I think you made another commit instead of amending the prior commit, and then uploaded that, so the patch is actually against your previous patch instead of against main, so it will not apply. To fix this, you can use 'git log' to verify that we have just two or something commits on the stack, and then use git rebase -i HEAD~3 to squash them down into one commit, then use git-arc to update the patch again.

In this case, it isn't complicated so I think it's okay with no commit message body except the PR trailer.

No Jim don't do that, use src/tools/tools/git-arc.sh to apply this commit to a fresh branch off main.

Also you can always fix a git tree or return it to any state it's been at.