From: Andrew Morton <akpm@linux-foundation.org>
To: Mark Brown <broonie@kernel.org>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
Brendan Jackman <brendan.jackman@linux.dev>,
Brendan Jackman <jackmanb@google.com>,
Dimitri Sivanich <sivanich@hpe.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the mm-stable tree
Date: Thu, 6 Aug 2026 11:29:02 -0700 [thread overview]
Message-ID: <20260806112902.22351f23796e442af0c3181f@linux-foundation.org> (raw)
In-Reply-To: <anSSANY5zZu4kytE@sirena.org.uk>
On Thu, 6 Aug 2026 14:54:08 +0100 Mark Brown <broonie@kernel.org> wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/misc/sgi-xp/xpc_uv.c
>
> between commit:
>
> 579c6de3def20 ("sgi-xp: use higher-level allocator API")
>
> from the mm-stable tree and commit:
>
> dbf69afe320eb ("misc: sgi-xp: Remove SGI XP drivers")
>
> from the char-misc tree.
>
> ...
>
> [The file is deleted.]
Ah, OK, thansk. I'd rather not rebase mm-stable for this - I'll
include it in notes-for-Linus.
prev parent reply other threads:[~2026-08-06 18:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-06 13:54 Mark Brown
2026-08-06 18:29 ` Andrew Morton [this message]
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=20260806112902.22351f23796e442af0c3181f@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=brendan.jackman@linux.dev \
--cc=broonie@kernel.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=jackmanb@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sivanich@hpe.com \
/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
all inboxes | Powered by JetHome®