<div dir="auto"><div>Sorry for the HTML post: I'm travelling for the next two weeks and I'll mostly be in read-only mode. Bob can help out during that time if necessary, though.<br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Linus Torvalds <<a href="mailto:torvalds@linux-foundation.org">torvalds@linux-foundation.org</a>> schrieb am Fr., 3. Sep. 2021, 18:20:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Wed, Sep 1, 2021 at 12:53 PM Andreas Gruenbacher <<a href="mailto:agruenba@redhat.com" target="_blank" rel="noreferrer">agruenba@redhat.com</a>> wrote:<br>
><br>
> So there's a minor merge conflict between Christoph's iomap_iter<br>
> conversion and this patch queue now, and I should probably clarify the<br>
> description of "iomap: Add done_before argument to iomap_dio_rw" that<br>
> Darrick ran into. Then there are the user copy issues that Al has<br>
> pointed out. Fixing those will create superficial conflicts with this<br>
> patch queue, but probably nothing serious.<br>
><br>
> So how should I proceed: do you expect a v8 of this patch queue on top<br>
> of the current mainline?<br>
<br>
So if you rebase for fixes, it's going to be a "next merge window" thing again.<br>
<br>
Personally, I'm ok with the series as is, and the conflict isn't an<br>
issue. So I'd take it as is, and then people can fix up niggling<br>
issues later.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">That sounds fine to me. We can clarify things as Darrick has suggested in a separate commit.</div><div dir="auto"><br></div><div dir="auto">Thanks,</div><div dir="auto">Andreas</div></div>