Merge branch 'next/defconfig' into for-next