From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Bradley Morgan <include@grrlz.net>,
Breno Leitao <leitao@debian.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>
Subject: Re: linux-next: manual merge of the mm-nonmm-unstable tree with the tip-fixes tree
Date: Thu, 2 Jul 2026 10:28:50 -0700 [thread overview]
Message-ID: <20260702102850.12ce82e1e2e95766d52e0093@linux-foundation.org> (raw)
In-Reply-To: <akZv7XdTZlkCUQ1L@sirena.org.uk>
On Thu, 2 Jul 2026 15:04:29 +0100 Mark Brown <broonie@kernel.org> 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 ;)
next prev parent reply other threads:[~2026-07-02 17:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-02 14:04 linux-next: manual merge of the mm-nonmm-unstable tree with the tip-fixes tree Mark Brown
2026-07-02 17:28 ` Andrew Morton [this message]
2026-07-03 14:41 ` Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260702102850.12ce82e1e2e95766d52e0093@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=include@grrlz.net \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mhiramat@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox