Merge branch 'rework/console-list-lock' into for-linus