[PATCH] Remove atomic_forced_read
Wilco Dijkstra
Wilco.Dijkstra@arm.com
Mon Aug 1 14:02:48 GMT 2022
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
More information about the Libc-alpha
mailing list