Received-SPF: pass (google.com: domain of linux-kernel+bounces-127237-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: Tue, 2 Apr 2024 11:21:37 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Christian Brauner <brauner@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the block tree with the vfs-brauner
 tree
Message-ID: <20240402112137.1ee85957@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/BxCzTd0iDCwaZ201janyBC4";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  io_uring/rw.c

between commit:

  80a07849c0b8 ("fs: claw back a few FMODE_* bits")

from the vfs-brauner tree and commit:

  40ffda3dc1a1 ("io_uring/rw: always setup io_async_rw for read/write reque=
sts")

from the block 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 io_uring/rw.c
index d9dfde1142a1,3134a6ece1be..000000000000
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@@ -1021,13 -1003,13 +1004,13 @@@ int io_write(struct io_kiocb *req, unsi
  	if (force_nonblock) {
  		/* If the file doesn't support async, just async punt */
  		if (unlikely(!io_file_supports_nowait(req)))
- 			goto copy_iov;
+ 			goto ret_eagain;
 =20
 -		/* File path supports NOWAIT for non-direct_IO only for block devices. =
*/
 +		/* Check if we can support NOWAIT. */
  		if (!(kiocb->ki_flags & IOCB_DIRECT) &&
 -			!(kiocb->ki_filp->f_mode & FMODE_BUF_WASYNC) &&
 -			(req->flags & REQ_F_ISREG))
 +		    !(req->file->f_op->fop_flags & FOP_BUFFER_WASYNC) &&
 +		    (req->flags & REQ_F_ISREG))
- 			goto copy_iov;
+ 			goto ret_eagain;
 =20
  		kiocb->ki_flags |=3D IOCB_NOWAIT;
  	} else {

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYLT5EACgkQAVBC80lX
0Gx1iAf+NrBJVTcz8K/6ezjUANPifsGkqwpKblsc6vyphLQiJUQKyh6qwC4hTjTr
7XUm3/ji8aU+vCpzYyeW/t5JGOi12co3tXwFLKFbxy5T9zQZX+b+bpEEKZ3mXc4x
3ctrmBlVLALe8Nt3KdawTsl4nvwswvBOzmemZyyu5+saHEC0HapImLyzuvEeFg+9
eINhHu8zoEjTuEpAxleJ7RnBlPFpdYbjAFCiHO0hVuzBNFxcDN+T6myR8fHdgQth
sNaE+peJbbJXmezN3jeiZNW/oiVJ+M7gKK7J7JaAPFPQ3/5nH5NyuaJ+M+O2TeHt
MSvzvk9QIC2e5yaxLF2EJlhtKef/7g==
=06Jt
-----END PGP SIGNATURE-----

--Sig_/BxCzTd0iDCwaZ201janyBC4--