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

Cross-merge networking fixes after downstream PR (net-7.0-rc4).

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
  db25c42c2e1f9 ("net/mlx5e: RX, Fix XDP multi-buf frag counting for striding RQ")
  dff1c3164a692 ("net/mlx5e: SHAMPO, Always calculate page size")
https://lore.kernel.org/aa7ORohmf67EKihj@sirena.org.uk

drivers/net/ethernet/ti/am65-cpsw-nuss.c
  840c9d13cb1ca ("net: ethernet: ti: am65-cpsw-nuss: Fix rx_filter value for PTP support")
  a23c657e332f2 ("net: ethernet: ti: am65-cpsw: Use also port number to identify timestamps")
https://lore.kernel.org/abK3EkIXuVgMyGI7@sirena.org.uk

No adjacent changes.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-drv.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe.h
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/marvell/octeontx2/af/rvu_devlink.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 8fb57a4f36dd8f3186263b4c29fd48b441b917dd,268e20884757738792ef3d6f13d1d1e746b2eca8..f5c0e2a0ada9acc9bb9525a395013c14ed4a35fb
--- 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
@@@ -1977,13 -1971,12 +1973,12 @@@ mlx5e_skb_from_cqe_mpwrq_nonlinear(stru
                        return NULL; /* page/packet was consumed by XDP */
                }
  
-               nr_frags_free = old_nr_frags - sinfo->nr_frags;
-               if (unlikely(nr_frags_free)) {
-                       frag_page -= nr_frags_free;
+               new_nr_frags = sinfo->nr_frags;
+               nr_frags_free = old_nr_frags - new_nr_frags;
+               if (unlikely(nr_frags_free))
 -                      truesize -= (nr_frags_free - 1) * PAGE_SIZE +
 +                      truesize -= (nr_frags_free - 1) * page_size +
                                ALIGN(pg_consumed_bytes,
                                      BIT(rq->mpwqe.log_stride_sz));
-               }
  
                len = mxbuf->xdp.data_end - mxbuf->xdp.data;
  

diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
Simple merge

diff --cc drivers/net/ethernet/spacemit/k1_emac.c
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
index a38bf7f4f43434e46944fe34938575f3a1b81404,265ce5479915f86003963289358eec705fc6dd07..d9400599e80a43ca0d9dbd78a7369f73ab5f5a49
--- 1/drivers/net/ethernet/ti/am65-cpsw-nuss.c
--- 2/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@@ -1351,8 -1351,8 +1351,8 @@@ static int am65_cpsw_nuss_rx_packets(st
        ndev_priv = netdev_priv(ndev);
        am65_cpsw_nuss_set_offload_fwd_mark(skb, ndev_priv->offload_fwd_mark);
        skb_put(skb, pkt_len);
-       if (port->rx_ts_enabled)
+       if (port->rx_ts_filter)
 -              am65_cpts_rx_timestamp(common->cpts, skb);
 +              am65_cpts_rx_timestamp(common->cpts, port_id, skb);
        skb_mark_for_recycle(skb);
        skb->protocol = eth_type_trans(skb, ndev);
        am65_cpsw_nuss_rx_csum(skb, csum_info);

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

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

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

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

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

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