linux-kernel - Re: linux-next: build failure after merge of the akpm-current 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]

Message-ID: <CACPK8XfVEn11ps5AuwcoUgPWE+hw-O+_rjAUARd=rkLCQNW8kA@mail.gmail.com>
Date:   Mon, 25 Oct 2021 06:16:56 +0000
From:   Joel Stanley <joel@....id.au>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Greg KH <gregkh@...uxfoundation.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        "Matthew Wilcox (Oracle)" <willy@...radead.org>,
        Eddie James <eajames@...ux.ibm.com>,
        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 akpm-current tree

On Mon, 25 Oct 2021 at 06:09, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi Joel,
>
> On Mon, 25 Oct 2021 05:58:37 +0000 Joel Stanley <joel@....id.au> wrote:
> >
> > If I apply this patch then the build fails in a tree that doesn't have
> > Willy's patch.
> >
> > Unless someone has a better suggestion I'll send a patch that includes
> > both headers for now, and make a note to remove the mm.h include down
> > the track.
>
> Don't apply anything.  Just remember to tell Linus (or whoever you
> merge this tree via) about this conflict and the resolution when you
> send the pull request.

Okay. It's not a conflict though, rather an ordering issue.

Greg has already merged this patch into his char-misc driver tree.