Hi,
On 2018-12-27 13:54:34 +0100, Magnus Hagander wrote:
> Finally getting around to playing with this one and it unfortunately
> doesn't apply anymore (0003).
>
> I think it's just a matter of adding those two rows though, right? That is,
> it's not an actual conflict it's just something else added in the same
> place?
What do you mean with "rows" here? I see a bunch of trivial conflicts
due to changes in atomics initialization but nothing else? And yes, I'd
not expect any meaningful conflicts.
Greetings,
Andres Freund