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

Stephen Rothwell
2021-10-25T06:09:45Z

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

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.

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]