From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Al Viro <viro@ZenIV•linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Pavel Begunkov <asml.silence@gmail•com>
Subject: linux-next: manual merge of the block tree with the vfs tree
Date: Mon, 28 Nov 2022 11:20:34 +1100 [thread overview]
Message-ID: <20221128112034.54479360@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
io_uring/net.c
between commit:
de4eda9de2d9 ("use less confusing names for iov_iter direction initializers")
from the vfs tree and commit:
42385b02baad ("io_uring/net: move mm accounting to a slower path")
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.
--
Cheers,
Stephen Rothwell
diff --cc io_uring/net.c
index 2818aeefea42,90342dcb6b1d..000000000000
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@@ -1087,7 -1095,8 +1095,8 @@@ int io_send_zc(struct io_kiocb *req, un
return ret;
msg.sg_from_iter = io_sg_from_iter;
} else {
+ io_notif_set_extended(zc->notif);
- ret = import_single_range(WRITE, zc->buf, zc->len, &iov,
+ ret = import_single_range(ITER_SOURCE, zc->buf, zc->len, &iov,
&msg.msg_iter);
if (unlikely(ret))
return ret;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-11-28 0:20 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 0:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-10 2:34 linux-next: manual merge of the block tree with the vfs tree Stephen Rothwell
2024-05-14 1:32 ` Stephen Rothwell
2022-07-15 3:09 Stephen Rothwell
2022-07-14 2:08 Stephen Rothwell
2022-07-14 16:36 ` Jens Axboe
2022-07-15 0:52 ` Al Viro
2022-07-15 1:04 ` Al Viro
2022-07-18 2:59 ` Stephen Rothwell
2022-07-18 4:58 ` Al Viro
2022-07-19 16:52 ` Jens Axboe
2022-07-20 2:45 ` Al Viro
2022-07-20 3:00 ` Jens Axboe
2022-07-11 3:57 Stephen Rothwell
2022-07-11 3:38 Stephen Rothwell
2022-05-23 2:28 Stephen Rothwell
2022-05-23 2:58 ` Jens Axboe
2022-05-23 22:54 ` Stephen Rothwell
2021-01-27 3:24 Stephen Rothwell
2019-12-20 1:36 Stephen Rothwell
2019-12-20 5:34 ` Jens Axboe
2020-01-20 1:40 ` Stephen Rothwell
2020-01-20 2:45 ` Jens Axboe
2020-01-20 2:57 ` Jens Axboe
2018-05-29 4:37 Stephen Rothwell
2018-05-29 4:33 Stephen Rothwell
2018-05-29 8:12 ` Christoph Hellwig
2018-05-29 14:22 ` Jens Axboe
2018-05-29 21:40 ` Stephen Rothwell
2018-05-29 22:17 ` Jens Axboe
2017-02-02 2:44 Stephen Rothwell
2017-02-21 22:14 ` Stephen Rothwell
2016-12-12 1:31 Stephen Rothwell
2016-12-12 1:44 ` Al Viro
2016-12-12 2:00 ` Ming Lei
2015-02-09 3:55 Stephen Rothwell
2015-01-27 3:57 Stephen Rothwell
2015-01-27 4:00 ` Jens Axboe
2015-01-27 4:54 ` Al Viro
2015-01-28 17:11 ` Christoph Hellwig
2015-01-29 5:15 ` Al Viro
2015-02-01 5:56 ` Al Viro
2015-02-02 8:06 ` Christoph Hellwig
2013-04-04 2:16 Stephen Rothwell
2010-05-18 3:04 Stephen Rothwell
2010-05-18 15:37 ` H Hartley Sweeten
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221128112034.54479360@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=asml.silence@gmail$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox