linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <aW912Qvlf_n2S8f6@sirena.org.uk>
Date: Tue, 20 Jan 2026 12:32:25 +0000
From: Mark Brown <broonie@...nel.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Tim Bird <tim.bird@...y.com>
Subject: linux-next: manual merge of the mm-nonmm-unstable tree with the spdx
 tree

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