Hi Vlastimil,
On Thu, Apr 27, 2023 at 8:12 AM Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> Ack. It's in my tree as commit 7e7757876f25 right now (not pushed out
> yet, will do the usual build tests and look around for other things
> pending).
Gaah. I just merged Andrew's MM tree, and while it had a lot of small
conflicts (and the ext4 ones were annoying semantic ones), the only
one that was in *confusing* code was the one introduced by this
one-liner fix.
I'm pretty sure I did the right thing, particularly given your other
patch for the mm tree, but please humor me and take a look at it?
That 'vma_merge()' function is the function from hell.
I haven't pushed out yet because it's still going through my build
tests, but it should be out soon.
Linus
