Merge branch 'dsa-mv88e6xxx-g2-cleanup-stp'