Received-SPF: pass (google.com: domain of linux-kernel+bounces-172565-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 8 May 2024 10:34:36 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Theodore Ts'o <tytso@mit.edu>
Cc: 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: linux-next: manual merge of the vfs-brauner tree with the ext4 tree
Message-ID: <20240508103436.589bb440@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/z6QW1W_rd/rhI.BiE15ht.j";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/z6QW1W_rd/rhI.BiE15ht.j
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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 m=
ethod")

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.

--=20
Cheers,
Stephen Rothwell

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

--Sig_/z6QW1W_rd/rhI.BiE15ht.j
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY6yJwACgkQAVBC80lX
0GyDZQf/TS0djE5HDw+uGXN7PsX7EJSoe8QFKVc5p5fAcv43Hiv5JsDwB/IrDuAY
OVa7N/aIrM4ZYZMsAwkVyYZfQkCTS6BxEs/xnICoE6+xbrttFlcedCNclJ5/7b4x
BtQm+YRNTTD7jDDweT2tUVq173dhAX7kIAAeWCUwlYVw1l8u4RIISPqGyd7Lw5Hz
sWsgBRgFNUJr93OcTl5mRsVe5kypTH1ZeDh+GJAMq60+9RYAqicD9VQ8h4R1CIu/
2l94FBnpsUtCerqkbxztS+6LoxUvYrahFMN5dnOpPC8eoNefafFa0yatA9DbeJKs
OCB2EQqkwgUYpvbNTFyBlYxxjQGCyA==
=9tMw
-----END PGP SIGNATURE-----

--Sig_/z6QW1W_rd/rhI.BiE15ht.j--