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 for Android: free password hash cracker in your pocket

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

Message-ID: <af81f306-aca0-4457-a2f8-0eea7cb4ed4b@sirena.org.uk>
Date: Tue, 20 Jan 2026 12:47:33 +0000
From: Mark Brown <broonie@...nel.org>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.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>,
	Tim Bird <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 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.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)