Merge branch 'topic/dirn_remove' into for-linus