tree 8f323487c0f38547ad0231afdcb1e633994bcd31
parent 009f33ed6f9d9da0141c2d18b1c7912d2d9be7c1
parent e47172ab7e4176883077b454286bbd5b87b5f488
author David S. Miller <davem@davemloft.net> 1424967723 -0500
committer David S. Miller <davem@davemloft.net> 1424967723 -0500

Merge branch 'rocker-next'

Scott Feldman says:

====================
rocker cleanups

Pushing out some rocker cleanups I've had in my queue for a while.  Nothing
major, just some sync-up with changes that already went into device code
(hard-coding desc err return values and lport renaming).  Also fixup
port fowarding transitions prompted by some DSA discussions about how to
restore port state when port leaves bridge.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>