On 11/28/22 6:13 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/erofs/fscache.c
>
> between commit:
>
> 313e9413d512 ("erofs: switch to prepare_ondemand_read() in fscache mode")
>
> from the erofs tree and commit:
>
> de4eda9de2d9 ("use less confusing names for iov_iter direction initializers")
>
> 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.
>
It looks good to me. Thanks.
--
Thanks,
Jingbo
