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