Merge branch 'topic/raid' into for-linus