Merge branch 'for-5.4/apple' into for-linus