From: Jens Axboe <axboe@kernel•dk>
To: broonie@kernel•org
Cc: Al Viro <viro@zeniv•linux.org.uk>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vfs tree with the origin tree
Date: Wed, 3 Aug 2022 08:14:27 -0600 [thread overview]
Message-ID: <6e61b631-fea0-7152-1e24-4f67cfd33f48@kernel.dk> (raw)
In-Reply-To: <20220803121815.54438-1-broonie@kernel.org>
On 8/3/22 6:18 AM, broonie@kernel•org wrote:
> Hi all,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/io_uring.c
>
> between commit:
>
> ed29b0b4fd835 ("io_uring: move to separate directory")
>
> from the origin tree and commit:
>
> 164f4064ca81e ("keep iocb_flags() result cached in struct file")
>
> 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.
>
> diff --git a/io_uring/rw.c b/io_uring/rw.c
> index 2b784795103cc..b20ba87e4926f 100644
> --- a/io_uring/rw.c
> +++ b/io_uring/rw.c
> @@ -661,7 +661,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode)
> if (!io_req_ffs_set(req))
> req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT;
>
> - kiocb->ki_flags = iocb_flags(file);
> + kiocb->ki_flags = file->f_iocb_flags;
> ret = kiocb_set_rw_flags(kiocb, rw->flags);
> if (unlikely(ret))
> return ret;
That's the right resolution, mentioned that in my pull request as well.
--
Jens Axboe
prev parent reply other threads:[~2022-08-03 14:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-03 12:18 linux-next: manual merge of the vfs tree with the origin tree broonie
2022-08-03 14:14 ` Jens Axboe [this message]
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=6e61b631-fea0-7152-1e24-4f67cfd33f48@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=broonie@kernel$(echo .)org \
--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