Merge branch 'next' into for-linus

Bring in second round of updates for 3.11.