Merge branch 'for-next/vdso' into for-next/core