]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'rocker-next'
authorDavid S. Miller <davem@davemloft.net>
Thu, 26 Feb 2015 16:22:03 +0000 (11:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Feb 2015 16:22:03 +0000 (11:22 -0500)
commitab080a5b30c59937409b33b01eaeedb393fb8e9f
tree8f323487c0f38547ad0231afdcb1e633994bcd31
parent65c269e172aea0b1e98b26f440259cdc703703cc
parentddc3633774b4669fc433f5b9f708b9a181912fb1
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>