Hi,
On 2019/5/1 ??????3:05, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the staging tree got conflicts in:
drivers/staging/erofs/data.c
drivers/staging/erofs/unzip_vle.c
between commit:
2b070cfe582b ("block: remove the i argument to bio_for_each_segment_all")
from the block tree and commit:
14a56ec65bab ("staging: erofs: support IO read error injection")
from the staging 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.
the patch looks good to me,
Thanks,
Gao Xiang
