From: David S. Miller Date: Thu, 27 Aug 2015 23:28:35 +0000 (-0700) Subject: Merge branch 'rocker-master-change' X-Git-Tag: firefly_0821_release~176^2~1159^2~63 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ec5d165555ea02ac9b69bbed8ff8f1de7c782f66;p=firefly-linux-kernel-4.4.55.git Merge branch 'rocker-master-change' Jiri Pirko says: ==================== rocker: make master change handling nicer Jiri Pirko (6): net: introduce change upper device notifier change info net: add netif_is_bridge_master helper net: add netif_is_ovs_master helper with IFF_OPENVSWITCH private flag net: kill long time unused bonding private flags rocker: use new helper to figure out master kind rocker: use change upper info ==================== Signed-off-by: David S. Miller --- ec5d165555ea02ac9b69bbed8ff8f1de7c782f66