Merge 'v4.12-rc1' into MTD

Bring a few queued patches in sync for -next development.