Merge tag 'v4.12-rc7' into devel

Linux 4.12-rc7