* linux-next: manual merge of the char-misc tree with the mm-stable tree
@ 2026-08-06 13:54 Mark Brown
2026-08-06 18:29 ` Andrew Morton
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2026-08-06 13:54 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann
Cc: Andrew Morton, Brendan Jackman, Brendan Jackman,
Dimitri Sivanich, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
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.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
[The file is deleted.]
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the char-misc tree with the mm-stable tree
2026-08-06 13:54 linux-next: manual merge of the char-misc tree with the mm-stable tree Mark Brown
@ 2026-08-06 18:29 ` Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2026-08-06 18:29 UTC (permalink / raw)
To: Mark Brown
Cc: Greg KH, Arnd Bergmann, Brendan Jackman, Brendan Jackman,
Dimitri Sivanich, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-08-06 18:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-06 13:54 linux-next: manual merge of the char-misc tree with the mm-stable tree Mark Brown
2026-08-06 18:29 ` Andrew Morton
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®