Received-SPF: pass (google.com: domain of linux-kernel+bounces-172777-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Wed, 8 May 2024 16:59:53 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoph Hellwig <hch@lst.de>
Cc: Christian Brauner <brauner@kernel.org>, Theodore Ts'o <tytso@mit.edu>,
 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: <20240508165953.67afc064@canb.auug.org.au>
In-Reply-To: <20240508064700.GB10736@lst.de>
References: <20240508103436.589bb440@canb.auug.org.au>
	<20240508064700.GB10736@lst.de>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/SVnt62e3fxePCBAtuy8ALwp";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi Christoph,

On Wed, 8 May 2024 08:47:00 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> On Wed, May 08, 2024 at 10:34:36AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >=20
> > 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
>=20
> Ted, if you still can maybe just drop the ext4 patch for now?  I can
> redo it for next merge window with the moved flag.

If the resolution I did is fine, I am sure Linus will cope (but worth
mentioning it to him in the pull request).  Its a simple enough conflict.

--=20
Cheers,
Stephen Rothwell

--Sig_/SVnt62e3fxePCBAtuy8ALwp
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY7IukACgkQAVBC80lX
0Gwt9QgAnGv4mg4zMe7MDHUTlN7LuxzXBrptZnifj2RDvFwidIoVkaUqFFpDU6Sf
7zfrNfDpyGu6qp0Za2DkzJrI7QwRMquTJuQTZBmVUrzdd3Jo8dCR66iHkwe1pKe5
Uc051btiXPWl7p+76F0ailO9X9J+ERqhgTv+/CJr2L2yZsr2dOV7YnccwuMnDiQN
EDvuxSJ3zNKgtz6zCqqI4KqTmx5UI6cpll/c4bfGM9gjzbmEO4xQ960/2Ol7C+ws
2Av3w18/kb+vjLM4d/CChNG9i3ds51u2wGxhDYgsZ9DFMC3zbCykldA2eR7nrWwg
KPn8YsGPRa4cF6UQofqDTFuix3rhXQ==
=0yuL
-----END PGP SIGNATURE-----

--Sig_/SVnt62e3fxePCBAtuy8ALwp--