Merge branch 'next' into for-linus

Prepare second round of input updates for 3.18.