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

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

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/atm/nicstar.c
index a602e6b96ff73e4e7f89a2125ddb48c159bb742a,09ad73361879e1a7b84944382e8927a01d4d00e4..5c7e4df159b9128d6bda914c1e6365f3fe6e6bb1
--- 1/drivers/atm/nicstar.c
--- 2/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@@ -1706,8 -1704,10 +1706,10 @@@ static int _ns_send(struct atm_vcc *vcc
                scq = card->scq0;
        }
  
 -      if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
 +      if (push_scqe(card, vc, scq, &scqe, skb, may_sleep) != 0) {
                atomic_inc(&vcc->stats->tx_err);
+               dma_unmap_single(&card->pcidev->dev, NS_PRV_DMA(skb), skb->len,
+                                DMA_TO_DEVICE);
                dev_kfree_skb_any(skb);
                return -EIO;
        }

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/global1.h
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/global1_vtu.c
Simple merge

diff --cc drivers/net/ethernet/faraday/ftgmac100.c
index 983b6db2d80d2fa2861ae114cd4540fb04b58872,80fb1f537bb331baf40b64e0bacc6fa2da78228e..88bfe21079386193c2397eaac860e49763daa5a6
--- 1/drivers/net/ethernet/faraday/ftgmac100.c
--- 2/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@@ -1923,9 -1906,9 +1923,11 @@@ static int ftgmac100_probe(struct platf
  err_register_netdev:
        clk_disable_unprepare(priv->rclk);
        clk_disable_unprepare(priv->clk);
 +err_phy_connect:
 +      ftgmac100_phy_disconnect(netdev);
  err_ncsi_dev:
+       if (priv->ndev)
+               ncsi_unregister_dev(priv->ndev);
        ftgmac100_destroy_mdio(netdev);
  err_setup_mdio:
        iounmap(priv->base);

diff --cc drivers/net/ethernet/freescale/enetc/enetc.c
Simple merge

diff --cc drivers/net/ethernet/freescale/enetc/enetc_hw.h
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/microchip/lan743x_main.c
Simple merge

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

diff --cc drivers/net/geneve.c
Simple merge

diff --cc drivers/net/netdevsim/dev.c
Simple merge

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

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

diff --cc include/net/ip_tunnels.h
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

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

diff --cc net/bridge/br_device.c
Simple merge

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

diff --cc net/smc/af_smc.c
Simple merge

diff --cc net/vmw_vsock/af_vsock.c
Simple merge