diff options
author | David S. Miller <davem@davemloft.net> | 2014-07-10 21:38:07 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-10 21:38:07 +0200 |
commit | 51b5bd199a54e9d4bed2b3a9192b07fdf7ce0adb (patch) | |
tree | 8d42638be83b6904e1a2a8f58f41988ee9390430 /drivers/net/ethernet/marvell/Makefile | |
parent | r8152: support jumbo frame for RTL8153 (diff) | |
parent | bridge: netlink dump interface at par with brctl (diff) | |
download | linux-51b5bd199a54e9d4bed2b3a9192b07fdf7ce0adb.tar.xz linux-51b5bd199a54e9d4bed2b3a9192b07fdf7ce0adb.zip |
Merge branch 'bridge-fdb-dump-filter'
Jamal Hadi Salim says:
====================
bridge: fdb dumping takes a filter device
v7:
Vxlan driver was not updated with new API. Found by DaveM
v6:
Missed checkpatch > 80 chars lines found by Varka Bhadram
v5:
Embarassing qlnic compile failure found by DaveM
v4:
Request from DaveM to use proper comment tagging and remove if-stmnt braces
V3:
Suggestion from Eric D. to use for_each_netdev
Suggestion from Stephen H. to reduce level of indentation
V2:
Suggestions from Vlad
Get rid of rcu read lock since rtnl_lock is being held
simplify for readability
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/Makefile')
0 files changed, 0 insertions, 0 deletions