Merge branch 'flushing' into for-linus