summaryrefslogtreecommitdiff
path: root/net/key
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-02 22:06:45 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-02 22:06:45 -0500
commitbdcfa156039dcfe2be989b73c4ae1be3d5d0f804 (patch)
tree3c46b3c7cb7b643ae1ad76f86b2904d0a1f7bcd6 /net/key
parent60f06fde4cff6f6134decbf09199b5e047bc3355 (diff)
parent740117a8e2b0e89c5fd6f1d5bbc12f87c46c80d7 (diff)
Merge branch 'MV88E6390-fixes'
Andrew Lunn says: ==================== MV88E6390 fixes Two patches, which have been posted before. Fix simple issues in the mv88e6390 support. These don't need to go to stable, since the mv88e6390 support in stable is insufficient to be usable. To apply cleanly, these patches rely on "net: dsa: mv88e6xxx: Workaround missing PHY". v2: Added Reviewed-by. Removed a redundant "the" ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions
umazet <edumazet@google.com> Reported-by: Dmitry Vyukov <dvyukov@google.com> Cc: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> 2017-02-01rtnetlink: Handle IFLA_MASTER parameter when processing rtnl_newlinkTheuns Verwoerd1-1/+6 Allow a master interface to be specified as one of the parameters when creating a new interface via rtnl_newlink. Previously this would require invoking interface creation, waiting for it to complete, and then separately binding that new interface to a master. In particular, this is used when creating a macvlan child interface for VRRP in a VRF configuration, allowing the interface creator to specify directly what master interface should be inherited by the child, without having to deal with asynchronous complications and potential race conditions. Signed-off-by: Theuns Verwoerd <theuns.verwoerd@alliedtelesis.co.nz> Acked-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>