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

Cross-merge networking fixes after downstream PR (net-7.1-rc8).

Conflicts:

drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
  f67aead16e85 ("net: txgbe: rework service event handling")
  57d39faed4c9 ("net: txgbe: improve functions of AML 40G devices")

net/rds/info.c
  512db8267b73 ("rds: mark snapshot pages dirty in rds_info_getsockopt()")
  6e94eeb2a2a6 ("rds: convert to getsockopt_iter")

Adjacent changes:

include/net/sock.h
  1ee90b77b727 ("net: guard timestamp cmsgs to real error queue skbs")
  f0de88303d5e ("net: make is_skb_wmem() available to modules")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/airoha/airoha_eth.c
Simple merge

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

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

diff --cc drivers/net/ethernet/intel/ice/ice_dpll.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
Simple merge

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

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

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

diff --cc include/linux/mlx5/vport.h
Simple merge

diff --cc include/net/netfilter/nf_conntrack_helper.h
Simple merge

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

diff --cc net/core/netdev-genl.c
Simple merge

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

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

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

diff --cc net/ipv4/netfilter/arp_tables.c
Simple merge

diff --cc net/ipv4/netfilter/ip_tables.c
Simple merge

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

diff --cc net/ipv6/netfilter/ip6_tables.c
Simple merge

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

diff --cc net/netlabel/netlabel_unlabeled.c
Simple merge

diff --cc net/qrtr/af_qrtr.c
Simple merge

diff --cc net/rds/info.c
index 499b3774860ea949a4f87ee8eb6bbcb2904fb954,17061f6ff74e58c2cc35c6699aa182490a7fe0a6..21b32eb165599749da237033243b11a8df0ca7b6
--- 1/net/rds/info.c
--- 2/net/rds/info.c
+++ b/net/rds/info.c
@@@ -239,16 -230,13 +239,16 @@@ call_func
                ret = lens.each;
        }
  
 -      if (put_user(len, optlen))
 -              ret = -EFAULT;
 +      opt->optlen = len;
  
  out:
 -      if (pages)
 +      /*
 +       * iov_iter_extract_pages() pins only user-backed (ubuf) iters;
 +       * iov_iter_extract_will_pin() reports whether an unpin is owed here.
 +       */
 +      if (pages && iov_iter_extract_will_pin(&opt->iter_out))
-               unpin_user_pages(pages, nr_pages);
+               unpin_user_pages_dirty_lock(pages, nr_pages, true);
 -      kfree(pages);
 +      kvfree(pages);
  
        return ret;
  }

diff --cc net/socket.c
Simple merge