linux-next: manual merge of the kvm tree with the powerpc tree
From: Stephen Rothwell
Date: Mon Jul 18 2016 - 01:55:15 EST
Today's linux-next merge of the kvm tree got a conflict in:
69c592ed40d3 ("powerpc/opal: Add real mode call wrappers")
from the powerpc tree and commit:
fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt")
from the kvm tree.
I fixed it up (on Michael's advise, I used the version form the kvm tree)
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.