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

drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
  9c5de246c1db ("net: sparx5: mdb add/del handle non-sparx5 devices")
  fbb89d02e33a ("net: sparx5: Allow mdb entries to both CPU and ports")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/ocelot/felix_vsc9959.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Simple merge

diff --cc drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
index 40ef9fa,5edc8b7..ec07f7d
--- 1/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
--- 2/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
@@@ -394,10 -394,15 +394,13 @@@ static int sparx5_handle_port_mdb_add(s
        struct sparx5 *spx5 = port->sparx5;
        u16 pgid_idx, vid;
        u32 mact_entry;
 +      bool is_host;
        int res, err;
  
 -      if (netif_is_bridge_master(v->obj.orig_dev)) {
 -              sparx5_mact_learn(spx5, PGID_CPU, v->addr, v->vid);
 -              return 0;
 -      }
+       if (!sparx5_netdevice_check(dev))
+               return -EOPNOTSUPP;
+ 
 +      is_host = netif_is_bridge_master(v->obj.orig_dev);
  
        /* When VLAN unaware the vlan value is not parsed and we receive vid 0.
         * Fall back to bridge vid 1.
@@@ -477,9 -466,17 +480,12 @@@ static int sparx5_handle_port_mdb_del(s
        struct sparx5_port *port = netdev_priv(dev);
        struct sparx5 *spx5 = port->sparx5;
        u16 pgid_idx, vid;
 -      u32 mact_entry, res, pgid_entry[3];
 -      int err;
 +      u32 mact_entry, res, pgid_entry[3], misc_cfg;
 +      bool host_ena;
  
 -      if (netif_is_bridge_master(v->obj.orig_dev)) {
 -              sparx5_mact_forget(spx5, v->addr, v->vid);
 -              return 0;
 -      }
 -
+       if (!sparx5_netdevice_check(dev))
+               return -EOPNOTSUPP;
+ 
        if (!br_vlan_enabled(spx5->hw_bridge_dev))
                vid = 1;
        else

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/phy/sfp.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/linux/phy.h
Simple merge

diff --cc kernel/trace/trace_uprobe.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/sit.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/subflow.c
Simple merge

diff --cc net/socket.c
Simple merge