Re: [Patch v9 00/10] block atomic writes

[John Garry]

On 21/06/2024 15:28, Jens Axboe wrote:
> > JFYI, we will probably notice a trivial conflict in
> > include/uapi/linux/stat.h when merging, as I fixed a comment there
> > which went into v6.10-rc4 . To resolve, the version in this series can
> > be used, as it also fixes that comment.
> I did notice and resolved it when I merged it into my for-next branch.
> And then was kind of annoyed when I noticed it was caused by a patch
> from yourself as well, surely that should either have been part of the
> series, just ignored for -git, or done after the fact. Kind of pointless
> to cause conflicts with your own series right when it needs ready to go
> into the for-next tree.

ok, I will co-ordinate things better in future.

Thanks again,
John