Subject: Re: linux-next: manual merge of the vfs tree with the origin tree

From: Jens Axboe <[email-masked]>
Date: Wed, 3 Aug 2022 08:14:27 -0600

On 8/3/22 6:18 AM, [email-masked] 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