Messages in this thread | | | From | Joel Stanley <> | Date | Mon, 25 Oct 2021 06:16:56 +0000 | Subject | Re: linux-next: build failure after merge of the akpm-current tree |
| |
On Mon, 25 Oct 2021 at 06:09, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi Joel, > > On Mon, 25 Oct 2021 05:58:37 +0000 Joel Stanley <joel@jms.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.
| |