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

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

net/core/dev.c
  9f30831390ed ("net: add rcu safety to rtnl_prop_list_size()")
  723de3ebef03 ("net: free altname using an RCU callback")

net/unix/garbage.c
  11498715f266 ("af_unix: Remove io_uring code for GC.")
  25236c91b5ab ("af_unix: Fix task hung while purging oob_skb in GC.")

drivers/net/ethernet/renesas/ravb_main.c
  ed4adc07207d ("net: ravb: Count packets instead of descriptors in GbEth RX path"
)
  c2da9408579d ("ravb: Add Rx checksum offload support for GbEth")

net/mptcp/protocol.c
  bdd70eb68913 ("mptcp: drop the push_pending field")
  28e5c1380506 ("mptcp: annotate lockless accesses around read-mostly fields")

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

diff --cc .mailmap
Simple merge

diff --cc Documentation/netlink/specs/dpll.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dpll/dpll_netlink.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

diff --cc drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
Simple merge

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

diff --cc drivers/net/ethernet/renesas/ravb_main.c
index f9a1e9038dbf16717b8ac3b813bee7d35f48b79a,f7566cfa45ca37a3cfd02331c24f49bf576393a7..529670852bd6dc9857dad768248c73879101bbfc
--- 1/drivers/net/ethernet/renesas/ravb_main.c
--- 2/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@@ -865,10 -815,8 +861,10 @@@ static bool ravb_rx_gbeth(struct net_de
                                skb = ravb_get_skb_gbeth(ndev, entry, desc);
                                skb_put(skb, pkt_len);
                                skb->protocol = eth_type_trans(skb, ndev);
 +                              if (ndev->features & NETIF_F_RXCSUM)
 +                                      ravb_rx_csum_gbeth(skb);
                                napi_gro_receive(&priv->napi[q], skb);
-                               stats->rx_packets++;
+                               rx_packets++;
                                stats->rx_bytes += pkt_len;
                                break;
                        case DT_FSTART:
@@@ -894,11 -842,9 +890,11 @@@
                                dev_kfree_skb(skb);
                                priv->rx_1st_skb->protocol =
                                        eth_type_trans(priv->rx_1st_skb, ndev);
 +                              if (ndev->features & NETIF_F_RXCSUM)
 +                                      ravb_rx_csum_gbeth(skb);
                                napi_gro_receive(&priv->napi[q],
                                                 priv->rx_1st_skb);
-                               stats->rx_packets++;
+                               rx_packets++;
                                stats->rx_bytes += pkt_len;
                                break;
                        }

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

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

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

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

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

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

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

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

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

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

diff --cc net/mptcp/protocol.c
index ad39f54b3a81b6745f28cb8d0ed8907bf194ac26,8ef2927ebca297bf60d51fae91732e09562fd496..c7af62c057bc727e456ad0e57f4271c08ce67ea2
--- 1/net/mptcp/protocol.c
--- 2/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@@ -3147,14 -3148,14 +3153,13 @@@ static int mptcp_disconnect(struct soc
        mptcp_destroy_common(msk, MPTCP_CF_FASTCLOSE);
        WRITE_ONCE(msk->flags, 0);
        msk->cb_flags = 0;
-       msk->push_pending = 0;
        msk->recovery = false;
 -      msk->can_ack = false;
 -      msk->fully_established = false;
 -      msk->rcv_data_fin = false;
 -      msk->snd_data_fin_enable = false;
 -      msk->rcv_fastclose = false;
 -      msk->use_64bit_ack = false;
 -      msk->bytes_consumed = 0;
 +      WRITE_ONCE(msk->can_ack, false);
 +      WRITE_ONCE(msk->fully_established, false);
 +      WRITE_ONCE(msk->rcv_data_fin, false);
 +      WRITE_ONCE(msk->snd_data_fin_enable, false);
 +      WRITE_ONCE(msk->rcv_fastclose, false);
 +      WRITE_ONCE(msk->use_64bit_ack, false);
        WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk)));
        mptcp_pm_data_reset(msk);
        mptcp_ca_reset(sk);

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

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

diff --cc net/sched/act_mirred.c
Simple merge

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

diff --cc net/unix/garbage.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge

diff --cc tools/testing/selftests/net/openvswitch/openvswitch.sh
Simple merge