Merge branch 'thermal-soc' into next