Merge branch 'swdev_ops'
commitf00bbd219caa7b3cc3a51b5ce551d1bd56f19662
authorDavid S. Miller <davem@davemloft.net>
Mon, 16 Mar 2015 04:14:47 +0000 (16 00:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Mar 2015 04:14:47 +0000 (16 00:14 -0400)
tree2a8d3b1d26426d662b1525db86fa2e6812147fce
parent7993d44ea1f7b17dd17863ab139d2c9df17dfe51
parent812a1c3ff3ee9d5100e0e71edb06681014e84a9b
Merge branch 'swdev_ops'

Scott Feldman says:

====================
switchdev: add swdev ops

v3:

 - Fix missing include for DSA build

v2:

 - Per Simon's review, squash some of the dependent commits into one to
   make series git bisect safe.

v1:

Per discussions at netconf, move switchdev ndo ops to a new swdev_ops to
keep ndo namespace clean and maintain switchdev-related ops into one place.

There are no functional changes here; just shuffling ops around for better
organization.
====================

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