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

[Stephen Rothwell]

Hi all,

On Wed, 8 May 2024 10:34:36 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/ext4/file.c
> 
> between commit:
> 
>   a0c7cce824a5 ("ext4: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method")
> 
> from the ext4 tree and commit:
> 
>   210a03c9d51a ("fs: claw back a few FMODE_* bits")
> 
> 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
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> 
> diff --cc fs/ext4/file.c
> index 77529c655f95,28c51b0cc4db..000000000000
> --- a/fs/ext4/file.c
> +++ b/fs/ext4/file.c
> @@@ -884,8 -885,7 +884,7 @@@ static int ext4_file_open(struct inode 
>   			return ret;
>   	}
>   
> - 	filp->f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC |
> - 			FMODE_DIO_PARALLEL_WRITE | FMODE_CAN_ODIRECT;
>  -	filp->f_mode |= FMODE_NOWAIT;
> ++	filp->f_mode |= FMODE_NOWAIT | FMODE_CAN_ODIRECT;
>   	return dquot_file_open(inode, filp);
>   }
>   

This is now a conflict between the ext4 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp9DgPRAJo5o.pgp
Description: OpenPGP digital signature