Merge branch 'for-linus' into testing