Re: linux-next: manual merge of the mm-nonmm-unstable tree with the tip-fixes tree

[Andrew Morton]

On Thu, 2 Jul 2026 15:04:29 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Hi all,
> 
> Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:
> 
>   lib/bootconfig.c
> 
> between commit:
> 
>   dec4d8118c179 ("bootconfig: fix NULL-pointer arithmetic in xbc_snprint_cmdline()")
> 
> from the tip-fixes tree and commit:
> 
>   9f2274451ae6b ("lib/bootconfig: fix undefined behavior involving NULL pointer arithmetic")
> 
> from the mm-nonmm-unstable tree which look like two fixes for the same
> issue.

hm, OK, thanks.  I don't know which is preferable, really.  I'll drop
the mm.git patch because the tip-fixes patch has a nice comment ;)