linux-kernel - RE: linux-next: manual merge of the mm-nonmm-unstable tree with the spdx tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID:
 <MW5PR13MB5632EA2D99D9A7BF8A4DBF3AFD89A@MW5PR13MB5632.namprd13.prod.outlook.com>
Date: Tue, 20 Jan 2026 19:28:23 +0000
From: "Bird, Tim" <Tim.Bird@...y.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Mark Brown
	<broonie@...nel.org>
CC: Andrew Morton <akpm@...ux-foundation.org>,
        Linux Kernel Mailing List
	<linux-kernel@...r.kernel.org>,
        Linux Next Mailing List
	<linux-next@...r.kernel.org>
Subject: RE: linux-next: manual merge of the mm-nonmm-unstable tree with the
 spdx tree

> -----Original Message-----
> From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Sent: Tuesday, January 20, 2026 5:44 AM
> To: Mark Brown <broonie@...nel.org>
> Cc: Andrew Morton <akpm@...ux-foundation.org>; Linux Kernel Mailing List <linux-kernel@...r.kernel.org>; Linux Next Mailing List <linux-
> next@...r.kernel.org>; Bird, Tim <Tim.Bird@...y.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