Merge branch 'for-4.18/rmi' into for-linus