From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: Mark Brown <broonie@kernel•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 13:43:55 +0100 [thread overview]
Message-ID: <2026012043-borax-cosmetics-0a0a@gregkh> (raw)
In-Reply-To: <aW912Qvlf_n2S8f6@sirena.org.uk>
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?
thanks,
greg k-h
next prev parent reply other threads:[~2026-01-20 12:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 12:32 linux-next: manual merge of the mm-nonmm-unstable tree with the spdx tree Mark Brown
2026-01-20 12:43 ` Greg Kroah-Hartman [this message]
2026-01-20 12:47 ` Mark Brown
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=2026012043-borax-cosmetics-0a0a@gregkh \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tim.bird@sony$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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