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

[Mark Brown]

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: signature.asc
Description: PGP signature