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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 2 Sep 2021 16:17:58 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Konstantin Komarov <almaz.alexandrovich@...agon-software.com>,
        Miklos Szeredi <miklos@...redi.hu>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the overlayfs tree

On Thu, Sep 2, 2021 at 4:03 PM Stephen Rothwell <sfr@...b.auug.org.au> 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.

            Linus