On 6/29/24 4:05 AM, Christian Brauner wrote: > On Fri, Jun 28, 2024 at 06:59:39PM GMT, Mark Brown wrote: >> Hi all, >> >> Today's linux-next merge of the block tree got a conflict in: >> >> fs/stat.c >> >> between commit: >> >> 0ef625bba6fb2 ("vfs: support statx(..., NULL, AT_EMPTY_PATH, ...)") >> >> from the vfs-brauner tree and commit: >> >> 0f9ca80fa4f96 ("fs: Add initial atomic write support info to statx") >> 9abcfbd235f59 ("block: Add atomic write support for statx") >> >> from the block tree. > > Jens, > > Can you give me the fs bits and I'll put them in a shared branch we can > both pull in? It's pretty far down in my tree at this point, so I think we'll just have to live with this conflict. At least it's not a complicated one to resolve. -- Jens Axboe