Merge branch 'next'

This brings in the u-boot-net PR from Joe.