From: Mark Brown <broonie@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.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>,
Tim Bird <tim.bird@sony.com>
Subject: Re: linux-next: manual merge of the mm-nonmm-unstable tree with the spdx tree
Date: Tue, 20 Jan 2026 12:47:33 +0000 [thread overview]
Message-ID: <af81f306-aca0-4457-a2f8-0eea7cb4ed4b@sirena.org.uk> (raw)
In-Reply-To: <2026012043-borax-cosmetics-0a0a@gregkh>
[-- 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 --]
next prev parent reply other threads:[~2026-01-20 12:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 12:32 Mark Brown
2026-01-20 12:43 ` Greg Kroah-Hartman
2026-01-20 12:47 ` Mark Brown [this message]
2026-01-20 19:28 ` Bird, Tim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=af81f306-aca0-4457-a2f8-0eea7cb4ed4b@sirena.org.uk \
--to=broonie@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tim.bird@sony.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®