* Re: linux-next: manual merge of the mm-nonmm-unstable tree with the spdx tree
2026-01-20 12:43 ` Greg Kroah-Hartman
@ 2026-01-20 12:47 ` Mark Brown
2026-01-20 19:28 ` Bird, Tim
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2026-01-20 12:47 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Andrew Morton, Linux Kernel Mailing List, Linux Next Mailing List,
Tim Bird
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
On Tue, Jan 20, 2026 at 01:43:55PM +0100, Greg Kroah-Hartman wrote:
> On Tue, Jan 20, 2026 at 12:32:25PM +0000, Mark Brown wrote:
> > diff --cc kernel/cpu.c
> > index 5185c0be847a0,a7a1cf8ea8e08..0000000000000
> > --- a/kernel/cpu.c
> > +++ b/kernel/cpu.c
> Odd diff, did something go wrong?
It's what git does when you end up taking the original change.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: linux-next: manual merge of the mm-nonmm-unstable tree with the spdx tree
2026-01-20 12:43 ` Greg Kroah-Hartman
2026-01-20 12:47 ` Mark Brown
@ 2026-01-20 19:28 ` Bird, Tim
1 sibling, 0 replies; 4+ messages in thread
From: Bird, Tim @ 2026-01-20 19:28 UTC (permalink / raw)
To: Greg Kroah-Hartman, Mark Brown
Cc: Andrew Morton, Linux Kernel Mailing List, Linux Next Mailing List
> -----Original Message-----
> From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
> Sent: Tuesday, January 20, 2026 5:44 AM
> To: Mark Brown <broonie@kernel•org>
> Cc: Andrew Morton <akpm@linux-foundation•org>; Linux Kernel Mailing List <linux-kernel@vger•kernel.org>; Linux Next Mailing List <linux-
> next@vger•kernel.org>; Bird, Tim <Tim.Bird@sony•com>
> Subject: Re: linux-next: manual merge of the mm-nonmm-unstable tree with the spdx tree
>
> On Tue, Jan 20, 2026 at 12: 32: 25PM +0000, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the mm-nonmm-unstable tree got a
> conflict in: > > kernel/cpu. c > > between commit: > > 330eb955ea9e7 ("kernel: add
> On Tue, Jan 20, 2026 at 12:32:25PM +0000, Mark Brown wrote:
> > Hi all,
> >
> > Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:
> >
> > kernel/cpu.c
> >
> > between commit:
> >
> > 330eb955ea9e7 ("kernel: add SPDX-License-Identifier lines")
> >
> > from the spdx tree and commit:
> >
> > 30811b31fac32 ("kernel: add SPDX-License-Identifier lines")
> >
> > from the mm-nonmm-unstable 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.
> >
> > diff --cc kernel/cpu.c
> > index 5185c0be847a0,a7a1cf8ea8e08..0000000000000
> > --- a/kernel/cpu.c
> > +++ b/kernel/cpu.c
>
> Odd diff, did something go wrong?
Both Greg and Andrew picked up this patch.
I should have caught this and told one or the other to drop it, I guess.
Is that the right approach?
Specific to this patch, who will carry it into the release?
Sorry for the problem.
-- Tim
^ permalink raw reply [flat|nested] 4+ messages in thread