Merge branch 'for-next/kvm/errata' into for-next/core