On Fri, Jul 30, 2021 at 10:23 AM Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> Well, I won't pull until the next merge window opens anyway (about a
> month away). But it would be good to have your tree in linux-next for
> at least a couple of weeks before that happens.
>
> Added Stephen to the participants list as a heads-up for him - letting
> him know where to fetch the git tree from will allow that to happen if
> you haven't done so already.
Ok, so I've merged the biggest pieces of this merge window, and I
haven't actually seen a NTFSv3 pull request yet.
I wonder if you expected that being in linux-next just "automatically"
causes the pull to happen, because that's not the case. We often have
things "brewing" in linux-next for a while, and it's there for testing
but not necessarily ready for prime time.
So linux-next is a preparatory thing, not a "this will get merged"
So to actually merge things, I will expect to get an explicit pull
request with the usual diffstat and shortlog, to show that yes, you
really think it's all good, and it's ready to merge.
Don't worry about - and don't try to fix - merge conflicts with
possible other work that has been going on. Stephen fixes it for
linux-next and makes people aware of it, and I want to _know_ about
them, but I will then handle and re-do the merge conflicts myself
based on what I have actually merged up to that point.
And of course, the other side of that is that if linux-next uncovered
other issues, or if there are things holding things up, please _don't_
feel obligated to send me a pull request. There is always the next
merge window.
Linus
