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

tools/testing/selftests/net/forwarding/Makefile
  f62c5acc800e ("selftests/net/forwarding: add missing tests to Makefile")
  50fe062c806e ("selftests: forwarding: new test, verify host mdb entries")
https://lore.kernel.org/all/20220502111539.0b7e4621@canb.auug.org.au/

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/microchip/ksz9477.c
Simple merge

diff --cc drivers/net/dsa/mt7530.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw_new.c
Simple merge

diff --cc drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 7a86ae8,d770b3a..016a9c4
--- 1/drivers/net/ethernet/xilinx/xilinx_emaclite.c
--- 2/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@@ -816,11 -836,16 +816,17 @@@ static int xemaclite_mdio_setup(struct 
                return -ENODEV;
        }
        npp = of_get_parent(np);
- 
-       of_address_to_resource(npp, 0, &res);
+       ret = of_address_to_resource(npp, 0, &res);
+       of_node_put(npp);
+       if (ret) {
+               dev_err(dev, "%s resource error!\n",
+                       dev->of_node->full_name);
+               of_node_put(np);
+               return ret;
+       }
        if (lp->ndev->mem_start != res.start) {
                struct phy_device *phydev;
 +
                phydev = of_phy_find_device(lp->phy_node);
                if (!phydev)
                        dev_info(dev,

diff --cc net/can/isotp.c
Simple merge

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

diff --cc net/nfc/core.c
index 6752498,5b286e1..6ff3e10
--- 1/net/nfc/core.c
--- 2/net/nfc/core.c
+++ b/net/nfc/core.c
@@@ -1165,8 -1166,8 +1166,9 @@@ void nfc_unregister_device(struct nfc_d
        if (dev->rfkill) {
                rfkill_unregister(dev->rfkill);
                rfkill_destroy(dev->rfkill);
 +              dev->rfkill = NULL;
        }
+       dev->shutting_down = true;
        device_unlock(&dev->dev);
  
        if (dev->ops->check_presence) {

diff --cc tools/testing/selftests/drivers/net/ocelot/tc_flower_chains.sh
Simple merge

diff --cc tools/testing/selftests/net/Makefile
Simple merge

diff --cc tools/testing/selftests/net/forwarding/Makefile
index ae80c2a,c87e674..0912f5a
--- 1/tools/testing/selftests/net/forwarding/Makefile
--- 2/tools/testing/selftests/net/forwarding/Makefile
+++ b/tools/testing/selftests/net/forwarding/Makefile
@@@ -2,7 -2,7 +2,8 @@@
  
  TEST_PROGS = bridge_igmp.sh \
        bridge_locked_port.sh \
 +      bridge_mdb.sh \
+       bridge_mld.sh \
        bridge_port_isolation.sh \
        bridge_sticky_fdb.sh \
        bridge_vlan_aware.sh \