On 5/22/22 8:28 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> fs/io_uring.c
>
> between commit:
>
> 4329490a78b6 ("io_uring_enter(): don't leave f.flags uninitialized")
>
> from the vfs tree and commit:
>
> 3e813c902672 ("io_uring: rework io_uring_enter to simplify return value")
>
> 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.
Fixup looks good, thanks.
--
Jens Axboe
