From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel•org>, Greg KH <greg@kroah•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Masahiro Yamada <masahiroy@kernel•org>
Subject: linux-next: manual merge of the rcu tree with the spdx tree
Date: Thu, 26 Mar 2020 14:12:35 +1100 [thread overview]
Message-ID: <20200326141235.718118af@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1138 bytes --]
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
tools/memory-model/litmus-tests/.gitignore
between commit:
d198b34f3855 (".gitignore: add SPDX License Identifier")
from the spdx tree and commits:
5381fb2b70e9 ("tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out")
dafa02882066 ("tools/memory-model: Keep assembly-language litmus tests")
from the rcu 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.
--
Cheers,
Stephen Rothwell
diff --cc tools/memory-model/litmus-tests/.gitignore
index c492a1ddad91,848e62d2a9b3..000000000000
--- a/tools/memory-model/litmus-tests/.gitignore
+++ b/tools/memory-model/litmus-tests/.gitignore
@@@ -1,2 -1,1 +1,2 @@@
+# SPDX-License-Identifier: GPL-2.0-only
- *.litmus.out
+ *.litmus.*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-26 3:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 3:12 Stephen Rothwell [this message]
2020-03-26 7:55 ` linux-next: manual merge of the rcu tree with the spdx tree Greg KH
2020-03-26 12:45 ` Paul E. McKenney
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=20200326141235.718118af@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=paulmck@kernel$(echo .)org \
/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