From: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
To: Carlos O'Donell <carlos@redhat.com>,
'GNU C Library' <libc-alpha@sourceware.org>
Subject: Re: [PATCH] Remove atomic_forced_read
Date: Mon, 1 Aug 2022 14:02:48 +0000 [thread overview]
Message-ID: <AM5PR0801MB1668BE8C9C23054A0A19A073839A9@AM5PR0801MB1668.eurprd08.prod.outlook.com> (raw)
In-Reply-To: <dc5064d2-8747-5a60-c4d6-87ae914742a1@redhat.com>
Hi Carlos,
> This fails pre-commit CI in that it doesn't apply.
>
> How are you generating these patches?
These patches are independent but they do edit adjacent lines in the same files.
So it sounds like the merge tool is getting confused (which is stupid because no
context is needed when you remove lines, all you need is matching the actual
lines removed, and that's trivial since they didn't change). When earlier patches
get committed the context should match up again and then they should apply.
Cheers,
Wilco
next prev parent reply other threads:[~2022-08-01 14:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 16:50 Wilco Dijkstra
2022-08-01 13:18 ` Carlos O'Donell
2022-08-01 14:02 ` Wilco Dijkstra [this message]
2022-08-01 14:08 ` Andreas Schwab
2022-08-01 14:28 ` Wilco Dijkstra
2022-08-01 14:51 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AM5PR0801MB1668BE8C9C23054A0A19A073839A9@AM5PR0801MB1668.eurprd08.prod.outlook.com \
--to=wilco.dijkstra@arm.com \
--cc=carlos@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).