Merge branch 'topic/ali5451-cleanup' into for-linus