From: David S. Miller <davem@davemloft.net>
Date: Thu, 26 Feb 2015 16:22:03 +0000 (-0500)
Subject: Merge branch 'rocker-next'
X-Git-Tag: firefly_0821_release~176^2~1974^2~395
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9003019192f045eee8e451916a4bc289c2a3e1be;p=firefly-linux-kernel-4.4.55.git

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>
---

9003019192f045eee8e451916a4bc289c2a3e1be