Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 47671ce04ac4..e52077ffe5ed 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3747,7 +3747,7 @@ void *netdev_lower_get_next_private_rcu(struct net_device *dev,
 void *netdev_lower_get_next(struct net_device *dev,
                                 struct list_head **iter);
 #define netdev_for_each_lower_dev(dev, ldev, iter) \
-        for (iter = &(dev)->adj_list.lower, \
+        for (iter = (dev)->adj_list.lower.next, \
              ldev = netdev_lower_get_next(dev, &(iter)); \
              ldev; \
              ldev = netdev_lower_get_next(dev, &(iter)))