From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paolo Bonzini <pbonzini@redhat•com>, KVM <kvm@vger•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>,
Andrew Jones <drjones@redhat•com>
Subject: linux-next: manual merge of the kvm tree with the spdx tree
Date: Thu, 26 Mar 2020 14:27:27 +1100 [thread overview]
Message-ID: <20200326142727.6991104f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1154 bytes --]
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
tools/testing/selftests/kvm/.gitignore
between commit:
d198b34f3855 (".gitignore: add SPDX License Identifier")
from the spdx tree and commit:
1914f624f5e3 ("selftests: KVM: SVM: Add vmcall test to gitignore")
from the kvm 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/testing/selftests/kvm/.gitignore
index 2f85dc944fbd,16877c3daabf..000000000000
--- a/tools/testing/selftests/kvm/.gitignore
+++ b/tools/testing/selftests/kvm/.gitignore
@@@ -1,6 -1,6 +1,7 @@@
+# SPDX-License-Identifier: GPL-2.0-only
- /s390x/sync_regs_test
/s390x/memop
+ /s390x/resets
+ /s390x/sync_regs_test
/x86_64/cr4_cpuid_sync_test
/x86_64/evmcs_test
/x86_64/hyperv_cpuid
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-26 3:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 3:27 Stephen Rothwell [this message]
2020-03-26 7:55 ` linux-next: manual merge of the kvm tree with the spdx tree Greg KH
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=20200326142727.6991104f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=drjones@redhat$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=pbonzini@redhat$(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