Hi Avi,
Today's linux-next merge of the kvm tree got a conflict in
arch/powerpc/kvm/powerpc.c between commits
2a4aca1144394653269720ffbb5a325a77abd5fa ("powerpc/mm: Split low level
tlb invalidate for nohash processors") and
fad7b9b51e21a97e9e2662f1b51869ed2d209097 ("powerpc: Fix KVM build on
ppc440") from the powerpc tree (already merged into Linus' tree) and
commits 48e5562f7278782ae5d1772b7baa1ff76f035285 ("KVM: ppc: Refactor
powerpc.c to relocate 440-specific code") and
408e29020273079445b5a9161a80d6ce07ab6b1c ("KVM: ppc: Implement in-kernel
exit timing statistics") from the kvm tree.
I just used the kvm tree version of the file.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpVR5Xlgsu7T.pgp
Description: PGP signature
