Re: linux-next: manual merge of the vfs-brauner tree with the exfat tree

[Namjae Jeon]

On Sat, Mar 28, 2026 at 2:35 AM Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
>   fs/exfat/file.c
>
> between commit:
>
>   9b373eacd6e6c4 ("exfat: add iomap buffered I/O support")
>
> from the exfat tree and commit:
>
>   5f36c9ca333360 ("fs: Rename generic_file_fsync() to simple_fsync()")
>
> from the vfs-brauner tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating

@@@ -633,14 -577,10 +633,14 @@@ int exfat_file_fsync(struct file *filp
        if (unlikely(exfat_forced_shutdown(inode->i_sb)))
                return -EIO;

 -      err = simple_fsync_noflush(filp, start, end, datasync);
 +      err = file_write_and_wait_range(filp, start, end);
        if (err)
                return err;

Looks good to me:)
To avoid merge conflicts, I will wait for Christian to send his PR to
Linus first. I’ll then include this change and submit exfat's PR
afterward.
Thanks!