On Fri, Aug 16, 2019 at 5:33 AM Christoph Hellwig <hch@xxxxxx> wrote: > > I see two new walk_page_range user in linux-next related to MADV_COLD > support (which probably really should use walk_range_vma), and then > there is the series from Steven, which hasn't been merged yet. It does sound like this might as well just be handled in linux-next, and there's no big advantage in me pulling the walker cleanups early. Honestly, even if it ends up being handled as a conflict resolution issue (rather than some shared branch), it probably simply isn't all that painful. We have those kinds of semantic conflicts all the time, it doesn't worry me too much. So I'm not worried about new _users_ of the page walker concurrently with the page walker interface itself being cleaned up. Those kinds of conflicts end up being "just make sure to update the new users to the new interface when they get pulled". Happens all the time. I'd be more worried about two different branches wanting to change the internal implementation of the page walker itself, and the actual *code* itself getting conflicts (as opposed to the interface vs users kind of conflicts). Those kinds of conflicts can be messy. But it sounds like Thomas Hellström's changes aren't that kind of thing. I'm still willing to do the early merge if it turns out to be hugely helpful, but from the discussion so far it does sound like "just merge during 5.4 merge window" is perfectly fine. Linus