Merge branch 'for-4.16/remove-immediate' into for-linus