Merge branch 'kvm-late-6.1-fixes' into HEAD