Merge branch 'topic/txx' into for-linus