Merge branch 'next/defconfig' into next/soc