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