Stephen Rothwell wrote:
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.
Fixed it up; thanks.
--
error compiling committee.c: too many arguments to function
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
