Merge branch 'kvm-fixes' into 'next'