Merge branch 'bcmring/removal' into next/cleanup2