Merge remote branch 'rmk/for-linus' into for-linus