Merge branch 'kvm' into next