[lkml]   [2020]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the kvm tree with the spdx tree
Hi all,

Today's linux-next merge of the kvm tree got a conflict in:


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.

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/resets
+ /s390x/sync_regs_test
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2020-03-26 04:28    [W:0.037 / U:0.660 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site