Merge tag 'v3.6-rc7' into i2c-embedded/for-next