Re: linux-next: build failure after merge of the overlayfs tree

From: Linus Torvalds
Date: Thu Sep 02 2021 - 19:18:20 EST

On Thu, Sep 2, 2021 at 4:03 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> This merge fix patch is now needed when the ntfs3 tree is merged with
> Linus' tree.

.. but again, DO NOT APPLY THAT MERGE FIX, because before it is merged
into my tree, it would be wrong and wouldn't even compile.

So just point out this semantic conflict in the pull request.

I'll see it myself when I do the test build, and I'd fix it up even
without that, but this is one of those "make sure everybody is on the
same page" things so that it doesn't fall through the cracks and
everybody knows what to expect.