Received-SPF: pass (google.com: domain of linux-kernel+bounces-178237-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 14 May 2024 11:28:56 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Theodore Ts'o <tytso@mit.edu>
Cc: Christian Brauner <brauner@kernel.org>, Christoph Hellwig <hch@lst.de>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, "Ritesh Harjani (IBM)"
 <ritesh.list@gmail.com>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the ext4
 tree
Message-ID: <20240514112856.5fec87d3@canb.auug.org.au>
In-Reply-To: <20240508103436.589bb440@canb.auug.org.au>
References: <20240508103436.589bb440@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/81GH6iVN8EzdCBJsC=fSqFz";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/81GH6iVN8EzdCBJsC=fSqFz
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 8 May 2024 10:34:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>=20
>   fs/ext4/file.c
>=20
> between commit:
>=20
>   a0c7cce824a5 ("ext4: set FMODE_CAN_ODIRECT instead of a dummy direct_IO=
 method")
>=20
> from the ext4 tree and commit:
>=20
>   210a03c9d51a ("fs: claw back a few FMODE_* bits")
>=20
> from the vfs-brauner tree.
>=20
> 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.
>=20
>=20
> 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=20
>   			return ret;
>   	}
>  =20
> - 	filp->f_mode |=3D FMODE_NOWAIT | FMODE_BUF_RASYNC |
> - 			FMODE_DIO_PARALLEL_WRITE | FMODE_CAN_ODIRECT;
>  -	filp->f_mode |=3D FMODE_NOWAIT;
> ++	filp->f_mode |=3D FMODE_NOWAIT | FMODE_CAN_ODIRECT;
>   	return dquot_file_open(inode, filp);
>   }
>  =20

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

--=20
Cheers,
Stephen Rothwell

--Sig_/81GH6iVN8EzdCBJsC=fSqFz
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZCvlgACgkQAVBC80lX
0GwgYAf/e6WpR68KaADRKpQivlWR+AYHNN/AiTzNHGe0bHRcTMJqweJH0gTUPfyz
sbMdSlI5J01sWpOor3X/DeaEeGgSYdgOVzzznJMwGa8VrnXEaZNFuKFP2aIhCNtq
w3l9ETQH4McB0RkL3uLwSIB06bDRYENdwzfwkPLWTzYBZplQWKHWRi52qBi1BfPp
ErjwZM3SiXOkGZp0t+s2DMIdslo079cN9y5FS44OzaUAz/Oo9mt/5ZYIyRBgSdxm
GlXGfXemxIvdf7IdETxvgZ3H5T6ojxYTGEfw3l53fMNENwd77NlW+6L/4BjaAMQU
6Cxgt6E1sHzbGhlp/nROqWN7TwHd1A==
=7BY0
-----END PGP SIGNATURE-----

--Sig_/81GH6iVN8EzdCBJsC=fSqFz--