Merge tag 'v4.0-rc7' into spi-img-spfi

Linux 4.0-rc7