Merge branch 'testing/bcmring' into next/cleanups