diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-19 15:45:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-19 15:45:16 -0500 |
commit | cbcd1fa72c7cc4ac5b8c8554731fdb06ac7ddaa8 (patch) | |
tree | 73b836097d22b1c91acaaa5441180f47756a2658 /net/sched/act_connmark.c | |
parent | mii: Handle link state changes for forced modes in mii_check_media() (diff) | |
parent | net: bridge: reject DSA-enabled master netdevices as bridge members (diff) | |
download | linux-dev-cbcd1fa72c7cc4ac5b8c8554731fdb06ac7ddaa8.tar.xz linux-dev-cbcd1fa72c7cc4ac5b8c8554731fdb06ac7ddaa8.zip |
Merge branch 'dsa-next'
Florian Fainelli says:
====================
net: DSA fixes for bridge and ip-autoconf
These two patches address some real world use cases of the DSA master and slave
network devices.
You have already seen patch 1 previously and you rejected it since my
explanations were not good enough to provide a justification as to why it is
useful, hopefully this time my explanation is better.
Patch 2 solves a different, yet very real problem as well at the bridge layer
when using DSA network devices.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions