Merge branch 'rework/misc-cleanups' into for-linus