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