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

Conflicts:
	net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

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

diff --cc net/bridge/br_mdb.c
index a8d0e93d43f248a3abcd003631dbef8250b39579,c11cf2611db0c870542969b6847d0a61d18b64d4..9f7cdd27b762b65cbb66fc7279785cddf040d275
--- 1/net/bridge/br_mdb.c
--- 2/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@@ -352,8 -348,10 +353,10 @@@ static int br_mdb_add_group(struct net_
        if (unlikely(!p))
                return -ENOMEM;
        rcu_assign_pointer(*pp, p);
+       if (state == MDB_TEMPORARY)
+               mod_timer(&p->timer, now + br->multicast_membership_interval);
  
 -      br_mdb_notify(br->dev, port, group, RTM_NEWMDB);
 +      br_mdb_notify(br->dev, port, group, RTM_NEWMDB, state);
        return 0;
  }
  
@@@ -376,7 -374,7 +379,8 @@@ static int __br_mdb_add(struct net *net
        if (!p || p->br != br || p->state == BR_STATE_DISABLED)
                return -EINVAL;
  
+       memset(&ip, 0, sizeof(ip));
 +      ip.vid = entry->vid;
        ip.proto = entry->addr.proto;
        if (ip.proto == htons(ETH_P_IP))
                ip.u.ip4 = entry->addr.u.ip4;
@@@ -423,21 -421,14 +427,15 @@@ static int __br_mdb_del(struct net_brid
        if (!netif_running(br->dev) || br->multicast_disabled)
                return -EINVAL;
  
+       memset(&ip, 0, sizeof(ip));
 +      ip.vid = entry->vid;
        ip.proto = entry->addr.proto;
-       if (ip.proto == htons(ETH_P_IP)) {
-               if (timer_pending(&br->ip4_other_query.timer))
-                       return -EBUSY;
- 
+       if (ip.proto == htons(ETH_P_IP))
                ip.u.ip4 = entry->addr.u.ip4;
  #if IS_ENABLED(CONFIG_IPV6)
-       } else {
-               if (timer_pending(&br->ip6_other_query.timer))
-                       return -EBUSY;
- 
+       else
                ip.u.ip6 = entry->addr.u.ip6;
  #endif
-       }
  
        spin_lock_bh(&br->multicast_lock);
        mdb = mlock_dereference(br->mdb, br);

diff --cc net/core/dev.c
Simple merge