Patch failed to apply, unsure why

Carlos O'Donell carlos@systemhalted.org
Sat Jul 6 13:45:29 GMT 2024


On Sat, Jul 6, 2024 at 1:02 AM k4lizen via Libc-help
<libc-help@sourceware.org> wrote:
> Patchwork link: https://patchwork.sourceware.org/project/glibc/patch/Kh9S4HnMXbEYGsdza15DjLBt1WbbFMpYTnuElnqLU3FjtFsBpE_T0Bi3wv0yZurMZ-Lkk8iNrntGJUQzY3Ni8620B8XeDxAP2hHXlVPu1gE=@proton.me/
>
> The email: https://sourceware.org/pipermail/libc-alpha/2024-July/157963.html
>
> The contribution checklist says:
> >After adjusting the git format-patch file you will be in one of two situations: [...]
> >You can attach the file to an email that contains the same subject, to, cc, body and other
> >email information
>
> I attached the file and also put the patch in the email body. What went wrong?

I think I know what went wrong. Thank you for your patience.

May you please send the patch again to the list but only inlined?

When inlining the patch please do not duplicate the header of the
patch in the email body e.g. From, Subject.

If you aren't using git send-email, then the easiest thing to do is
copy the content of the file generated with git format-patch,
everything after Subject: into the email body, and use the From: and
Subject: to set those fields in your mail program.

I believe that the root cause of the problem is that you both inlined
the patch with headers and also attached it.

I recommend doing only one of those things, otherwise the CI systems
appear to apply the patch twice, and the second time it fails as
"Already applied"

Good luck!

Cheers,
Carlos.


More information about the Libc-help mailing list