Hi Alexander, Today's linux-next merge of the kvm-ppc tree got a conflict in arch/powerpc/kvm/44x_emulate.c between commits from the kvm tree and the same patches plus another commit from the kvm-ppc tree.
I just used the kvm-ppc tree version.
This happened because
1) you rebased/rewrote your tree before it was merged into the kvm tree
2) left the old version in your kvm-ppc-next branch
3) added some more commits to your kvm-ppc-next branch
Don't do that!
Unfortunately, the best thing you can do now is to rebase your
kvm-ppc-next branch on top of the kvm tree. :-(
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
pgpJXxD9vRop7.pgp
Description: PGP signature
_______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
