Re: linux-next: manual merge of the char-misc tree with the mm-stable tree

Andrew Morton <[email protected]>
Newsgroups org.kernel.vger.linux-next,org.kernel.vger.linux-kernel
Message-ID <[email protected]> 
On Thu, 6 Aug 2026 14:54:08 +0100 Mark Brown <[email protected]> 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.
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.