On Thu, Mar 26, 2020 at 02:27:27PM +1100, Stephen Rothwell wrote: > 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. Looks good, thanks!