On 6/21/24 1:59 AM, John Garry wrote: > On 20/06/2024 22:23, Jens Axboe wrote: >> On Thu, 20 Jun 2024 12:53:49 +0000, John Garry wrote: >>> This series introduces a proposal to implementing atomic writes in the >>> kernel for torn-write protection. >>> >>> This series takes the approach of adding a new "atomic" flag to each of >>> pwritev2() and iocb->ki_flags - RWF_ATOMIC and IOCB_ATOMIC, respectively. >>> When set, these indicate that we want the write issued "atomically". >>> >>> [...] >> Applied, thanks! > > Thanks Jens. > > 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. -- Jens Axboe
