]> 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)
commit844bc12589f90503de072924e840a1e7e1fe36d1
tree8f323487c0f38547ad0231afdcb1e633994bcd31
parent8c1b31c61a89a2c11d687296084e83976fb72c1f
parentd56c2fbb7420dc8f992a0bbb2de48767d3a5e960
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>