Merge branch 'reset/for-4.8-2' into next/dt