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

Two minor conflicts:

1) net/ipv4/route.c, adding a new local variable while
   moving another local variable and removing it's
   initial assignment.

2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes.
   One pretty prints the port mode differently, whilst another
   changes the driver to try and obtain the port mode from
   the port node rather than the switch node.

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

diff --cc Documentation/networking/ethtool-netlink.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/microchip/ksz9477.c
index b62dd64,2f5506a..153664b
--- 1/drivers/net/dsa/microchip/ksz9477.c
--- 2/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@@ -1229,15 -1229,12 +1229,15 @@@ static void ksz9477_port_setup(struct k
                        ksz9477_set_gbit(dev, true, &data8);
                        data8 &= ~PORT_RGMII_ID_IG_ENABLE;
                        data8 &= ~PORT_RGMII_ID_EG_ENABLE;
-                       if (dev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
-                           dev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+                       if (p->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+                           p->interface == PHY_INTERFACE_MODE_RGMII_RXID)
                                data8 |= PORT_RGMII_ID_IG_ENABLE;
-                       if (dev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
-                           dev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+                       if (p->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+                           p->interface == PHY_INTERFACE_MODE_RGMII_TXID)
                                data8 |= PORT_RGMII_ID_EG_ENABLE;
 +                      /* On KSZ9893, disable RGMII in-band status support */
 +                      if (dev->features & IS_9893)
 +                              data8 &= ~PORT_MII_MAC_MODE;
                        p->phydev.speed = SPEED_1000;
                        break;
                }
@@@ -1280,21 -1276,22 +1281,30 @@@ static void ksz9477_config_cpu_port(str
                         * note the difference to help debugging.
                         */
                        interface = ksz9477_get_interface(dev, i);
-                       if (!dev->interface)
-                               dev->interface = interface;
-                       if (interface && interface != dev->interface) {
+                       if (!p->interface) {
+                               if (dev->compat_interface) {
+                                       dev_warn(dev->dev,
+                                                "Using legacy switch \"phy-mode\" property, because it is missing on port %d node. "
+                                                "Please update your device tree.\n",
+                                                i);
+                                       p->interface = dev->compat_interface;
+                               } else {
+                                       p->interface = interface;
+                               }
+                       }
 -                      if (interface && interface != p->interface)
 -                              dev_info(dev->dev,
 -                                       "use %s instead of %s\n",
 -                                        phy_modes(p->interface),
 -                                        phy_modes(interface));
++                      if (interface && interface != p->interface) {
 +                              prev_msg = " instead of ";
 +                              prev_mode = phy_modes(interface);
 +                      } else {
 +                              prev_msg = "";
 +                              prev_mode = "";
 +                      }
 +                      dev_info(dev->dev,
 +                               "Port%d: using phy mode %s%s%s\n",
 +                               i,
-                                phy_modes(dev->interface),
++                               phy_modes(p->interface),
 +                               prev_msg,
 +                               prev_mode);
  
                        /* enable cpu port */
                        ksz9477_port_setup(dev, i, true);

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

diff --cc drivers/net/dsa/ocelot/felix.c
index f9a7034,01427cd..5f395d4
--- 1/drivers/net/dsa/ocelot/felix.c
--- 2/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@@ -554,9 -585,12 +554,12 @@@ static int felix_setup(struct dsa_switc
        if (err)
                return err;
  
-       ocelot_init(ocelot);
+       err = ocelot_init(ocelot);
+       if (err)
+               return err;
+ 
        if (ocelot->ptp) {
 -              err = ocelot_init_timestamp(ocelot, &ocelot_ptp_clock_info);
 +              err = ocelot_init_timestamp(ocelot, felix->info->ptp_caps);
                if (err) {
                        dev_err(ocelot->dev,
                                "Timestamp initialization failed\n");

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

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

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

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

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

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
Simple merge

diff --cc drivers/net/ethernet/dec/tulip/de2104x.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_main.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_rx.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_tx.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
index e5ddefe,c4345e3..14df3ae
--- 1/drivers/net/ethernet/marvell/mvneta.c
--- 2/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@@ -2375,10 -2381,14 +2375,14 @@@ static int mvneta_rx_swbm(struct napi_s
                        desc_status = rx_desc->status;
  
                        mvneta_swbm_rx_frame(pp, rx_desc, rxq, &xdp_buf,
 -                                           &size, page, &ps);
 +                                           &size, page);
                } else {
-                       if (unlikely(!xdp_buf.data_hard_start))
+                       if (unlikely(!xdp_buf.data_hard_start)) {
+                               rx_desc->buf_phys_addr = 0;
+                               page_pool_put_full_page(rxq->page_pool, page,
+                                                       true);
                                continue;
+                       }
  
                        mvneta_swbm_add_rx_fragment(pp, rx_desc, rxq, &xdp_buf,
                                                    &size, page);

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
index bb6669d,40db27b..8e7b877
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c
@@@ -48,13 -47,9 +47,9 @@@ struct sk_buff *mlx5e_xsk_skb_from_cqe_
  
        xdp->data_end = xdp->data + cqe_bcnt32;
        xdp_set_data_meta_invalid(xdp);
 -      xsk_buff_dma_sync_for_cpu(xdp);
 -      prefetch(xdp->data);
 +      xsk_buff_dma_sync_for_cpu(xdp, rq->xsk_pool);
 +      net_prefetch(xdp->data);
  
-       rcu_read_lock();
-       consumed = mlx5e_xdp_handle(rq, NULL, &cqe_bcnt32, xdp);
-       rcu_read_unlock();
- 
        /* Possible flows:
         * - XDP_REDIRECT to XSKMAP:
         *   The page is owned by the userspace from now.

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

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index c9c82b1,64c8ac5..310533f
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@@ -1149,14 -1144,11 +1152,11 @@@ mlx5e_skb_from_cqe_linear(struct mlx5e_
  
        dma_sync_single_range_for_cpu(rq->pdev, di->addr, wi->offset,
                                      frag_size, DMA_FROM_DEVICE);
 -      prefetchw(va); /* xdp_frame data area */
 -      prefetch(data);
 +      net_prefetchw(va); /* xdp_frame data area */
 +      net_prefetch(data);
  
-       rcu_read_lock();
        mlx5e_fill_xdp_buff(rq, va, rx_headroom, cqe_bcnt, &xdp);
-       consumed = mlx5e_xdp_handle(rq, di, &cqe_bcnt, &xdp);
-       rcu_read_unlock();
-       if (consumed)
+       if (mlx5e_xdp_handle(rq, di, &cqe_bcnt, &xdp))
                return NULL; /* page/packet was consumed by XDP */
  
        rx_headroom = xdp.data - xdp.data_hard_start;
@@@ -1460,14 -1451,11 +1459,11 @@@ mlx5e_skb_from_cqe_mpwrq_linear(struct 
  
        dma_sync_single_range_for_cpu(rq->pdev, di->addr, head_offset,
                                      frag_size, DMA_FROM_DEVICE);
 -      prefetchw(va); /* xdp_frame data area */
 -      prefetch(data);
 +      net_prefetchw(va); /* xdp_frame data area */
 +      net_prefetch(data);
  
-       rcu_read_lock();
        mlx5e_fill_xdp_buff(rq, va, rx_headroom, cqe_bcnt32, &xdp);
-       consumed = mlx5e_xdp_handle(rq, di, &cqe_bcnt32, &xdp);
-       rcu_read_unlock();
-       if (consumed) {
+       if (mlx5e_xdp_handle(rq, di, &cqe_bcnt32, &xdp)) {
                if (__test_and_clear_bit(MLX5E_RQ_FLAG_XDP_XMIT, rq->flags))
                        __set_bit(page_idx, wi->xdp_xmit_bitmap); /* non-atomic */
                return NULL; /* page/packet was consumed by XDP */

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
index 9d9ee26,562263d..771f30c
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
@@@ -103,10 -103,8 +103,11 @@@ unsigned int mlx5e_stats_total_num(stru
  void mlx5e_stats_update(struct mlx5e_priv *priv);
  void mlx5e_stats_fill(struct mlx5e_priv *priv, u64 *data, int idx);
  void mlx5e_stats_fill_strings(struct mlx5e_priv *priv, u8 *data);
+ void mlx5e_stats_update_ndo_stats(struct mlx5e_priv *priv);
  
 +void mlx5e_stats_pause_get(struct mlx5e_priv *priv,
 +                         struct ethtool_pause_stats *pause_stats);
 +
  /* Concrete NIC Stats */
  
  struct mlx5e_sw_stats {

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

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

diff --cc drivers/net/ethernet/qlogic/qed/qed_dev.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qede/qede_main.c
Simple merge

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

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/fw.h
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
Simple merge

diff --cc drivers/s390/net/qeth_l2_main.c
index 54e0251,6384f7a..e12ac32
--- 1/drivers/s390/net/qeth_l2_main.c
--- 2/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@@ -322,16 -288,11 +321,17 @@@ static void qeth_l2_stop_card(struct qe
        }
  
        qeth_qdio_clear_card(card, 0);
+       qeth_drain_output_queues(card);
        qeth_clear_working_pool_list(card);
 -      flush_workqueue(card->event_wq);
 +      qeth_l2_set_pnso_mode(card, QETH_PNSO_NONE);
        qeth_flush_local_addrs(card);
        card->info.promisc_mode = 0;
 +
 +      if (priv->brport_features & BR_LEARNING_SYNC) {
 +              rtnl_lock();
 +              qeth_l2_dev2br_fdb_flush(card);
 +              rtnl_unlock();
 +      }
  }
  
  static int qeth_l2_request_initial_mac(struct qeth_card *card)

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

diff --cc fs/io_uring.c
Simple merge

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

diff --cc include/linux/qed/qed_if.h
Simple merge

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

diff --cc include/uapi/linux/ethtool_netlink.h
Simple merge

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

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

diff --cc mm/filemap.c
Simple merge

diff --cc net/batman-adv/bridge_loop_avoidance.c
Simple merge

diff --cc net/batman-adv/multicast.c
Simple merge

diff --cc net/batman-adv/soft-interface.c
Simple merge

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

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

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

diff --cc net/dsa/slave.c
Simple merge

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

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

diff --cc net/ipv4/route.c
index 2c05b86,58642b2..d15a78b
--- 1/net/ipv4/route.c
--- 2/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@@ -1013,9 -1015,10 +1015,10 @@@ out:  kfree_skb(skb)
  static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
  {
        struct dst_entry *dst = &rt->dst;
 -      u32 old_mtu = ipv4_mtu(dst);
+       struct net *net = dev_net(dst->dev);
        struct fib_result res;
        bool lock = false;
 +      u32 old_mtu;
  
        if (ip_mtu_locked(dst))
                return;

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

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

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/vht.c
Simple merge

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

diff --cc net/mptcp/subflow.c
index 34d6230,9ead43f..141d555
--- 1/net/mptcp/subflow.c
--- 2/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@@ -1088,12 -1108,13 +1089,13 @@@ int __mptcp_subflow_connect(struct soc
                goto failed;
  
        mptcp_crypto_key_sha(subflow->remote_key, &remote_token, NULL);
-       pr_debug("msk=%p remote_token=%u local_id=%d", msk, remote_token,
-                local_id);
+       pr_debug("msk=%p remote_token=%u local_id=%d remote_id=%d", msk,
+                remote_token, local_id, remote_id);
        subflow->remote_token = remote_token;
        subflow->local_id = local_id;
+       subflow->remote_id = remote_id;
        subflow->request_join = 1;
 -      subflow->request_bkup = 1;
 +      subflow->request_bkup = !!(loc->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
        mptcp_info2sockaddr(remote, &addr);
  
        err = kernel_connect(sf, (struct sockaddr *)&addr, addrlen, O_NONBLOCK);

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/tipc/link.c
Simple merge

diff --cc net/tipc/msg.c
Simple merge

diff --cc net/tipc/socket.c
Simple merge

diff --cc net/wireless/util.c
Simple merge

diff --cc net/xdp/xdp_umem.c
Simple merge

diff --cc tools/lib/bpf/Makefile
index adbe994,9ae8f4e..f432496
--- 1/tools/lib/bpf/Makefile
--- 2/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@@ -59,10 -56,10 +59,10 @@@ ifndef VERBOS
  endif
  
  FEATURE_USER = .libbpf
 -FEATURE_TESTS = libelf libelf-mmap zlib bpf reallocarray
 +FEATURE_TESTS = libelf zlib bpf
  FEATURE_DISPLAY = libelf zlib bpf
  
- INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi
+ INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/include/uapi
  FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES)
  
  check_feat := 1

diff --cc tools/lib/bpf/libbpf.c
Simple merge