Merge branch 'console-registration-cleanup' into for-linus