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 requests")
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.
--
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 |= IOCB_WRITE;
if (likely(req->file->f_op->write_iter))
- ret2 = call_write_iter(req->file, kiocb, &io->iter);
- ret2 = req->file->f_op->write_iter(kiocb, &s->iter);
++ ret2 = req->file->f_op->write_iter(kiocb, &io->iter);
else if (req->file->f_op->write)
- ret2 = loop_rw_iter(WRITE, rw, &s->iter);
+ ret2 = loop_rw_iter(WRITE, rw, &io->iter);
else
ret2 = -EINVAL;
Attachment:
pgpeHiJxD4XxI.pgp
Description: OpenPGP digital signature
