Received-SPF: pass (google.com: domain of linux-kernel+bounces-178229-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 14 May 2024 11:04:42 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Jens Axboe <axboe@kernel.dk>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Miklos Szeredi <mszeredi@redhat.com>
Subject: linux-next: manual merge of the vfs tree with Linus' tree
Message-ID: <20240514110442.7431447b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/IDc3V30OQnlG3XYUMBjT1o/";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  io_uring/rw.c

between commits:

  a9165b83c193 ("io_uring/rw: always setup io_async_rw for read/write reque=
sts")
  0d10bd77a1be ("io_uring: get rid of struct io_rw_state")

from Linus' tree and commit:

  7c98f7cb8fda ("remove call_{read,write}_iter() functions")

from the vfs 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 894c43a5fc0e,29f4aa153ab9..000000000000
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@@ -1046,9 -1054,9 +1046,9 @@@ int io_write(struct io_kiocb *req, unsi
  	kiocb->ki_flags |=3D IOCB_WRITE;
 =20
  	if (likely(req->file->f_op->write_iter))
- 		ret2 =3D call_write_iter(req->file, kiocb, &io->iter);
 -		ret2 =3D req->file->f_op->write_iter(kiocb, &s->iter);
++		ret2 =3D req->file->f_op->write_iter(kiocb, &io->iter);
  	else if (req->file->f_op->write)
 -		ret2 =3D loop_rw_iter(WRITE, rw, &s->iter);
 +		ret2 =3D loop_rw_iter(WRITE, rw, &io->iter);
  	else
  		ret2 =3D -EINVAL;
 =20

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZCuKoACgkQAVBC80lX
0Gwt0Qf+P+R1DRmRIZ0c5rhC6IvMKMm8bOF8U/+yS9a4b4MMeONeNfmNQbgRFqmA
i5NXRKkCltxYMddkkt7ZGdYbcbRf1PNveMLccLqtjr9WpnhqGpk5sD2/wp0qogAO
P7D7kNE2Ux+D+6447+xGuGrGkO2U1qMvOTnBT+E0uhUwSsZV0zzp0bTlueTOomqP
0eHC7AhjHEce/HZMGqFfcYJ5g4WE0P2zDqgzh0V5hvicTnrEcTC4mJ+HAlaBtuxS
IO49ngeSbCxeXNxkfqxN7hTmbkem94WtyRFWit/BGcL+uvmTMUEtmlEQQ/SQzcMO
ValXUKg0sJ+6qm8MqYYAEHIB5NJ6tQ==
=fq4O
-----END PGP SIGNATURE-----

--Sig_/IDc3V30OQnlG3XYUMBjT1o/--