From: David S. Miller <davem@davemloft.net>
Date: Thu, 27 Aug 2015 23:28:35 +0000 (-0700)
Subject: Merge branch 'rocker-master-change'
X-Git-Tag: omap-for-v4.3/fixes-rc1~110^2~63
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec5d165555ea02ac9b69bbed8ff8f1de7c782f66;p=pandora-kernel.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 <davem@davemloft.net>
---

ec5d165555ea02ac9b69bbed8ff8f1de7c782f66