Merge branch 'for-next/asm-annotations' into for-next/core