Hi Avi,
Today's linux-next merge of the kvm tree got a conflict in
include/linux/kvm.h between commit
1327138e294ffda120a50c8f31d792addb196c79 ("KVM: fix userspace ABI
breakage") from Linus' tree (a version of which which also exists in the
kvm tree) and commit b8486fbae0046883437c91e9b475f1878888fe72 ("KVM:
kvmtrace: replace get_cycles with ktime_get v3") from the kvm tree.
I used the version from the kvm tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpMOiiomANf4.pgp
Description: PGP signature
