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

Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 6ba0883b9c36..621c1bddeee9 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1151,6 +1151,8 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
         netdev_upper_dev_unlink(port_dev, dev);
         team_port_disable_netpoll(port);
         vlan_vids_del_by_dev(port_dev, dev);
+        dev_uc_unsync(port_dev, dev);
+        dev_mc_unsync(port_dev, dev);
         dev_close(port_dev);
         team_port_leave(team, port);