Merge branch 'for-next' into for-linus

For 4.12 merge.