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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/sched/sch_taprio.c
  d636fc5dd692 ("net: sched: add rcu annotations around qdisc->qdisc_sleeping")
  dced11ef84fb ("net/sched: taprio: don't overwrite "sch" variable in taprio_dump_class_stats()")

net/ipv4/sysctl_net_ipv4.c
  e209fee4118f ("net/ipv4: ping_group_range: allow GID from 2147483648 to 4294967294")
  ccce324dabfe ("tcp: make the first N SYN RTO backoffs linear")
https://lore.kernel.org/all/20230605100816.08d41a7b@canb.auug.org.au/

No adjacent changes.

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

diff --cc Documentation/networking/ip-sysctl.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/lan9303-core.c
Simple merge

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

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

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
Simple merge

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

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

diff --cc drivers/net/wireless/realtek/rtw88/mac80211.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/core.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/mac80211.c
Simple merge

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

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

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

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

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

diff --cc net/ipv4/sysctl_net_ipv4.c
index ef26f90,88dfe51..356afe5
--- 1/net/ipv4/sysctl_net_ipv4.c
--- 2/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@@ -34,9 -34,8 +34,9 @@@ static int ip_ttl_min = 1
  static int ip_ttl_max = 255;
  static int tcp_syn_retries_min = 1;
  static int tcp_syn_retries_max = MAX_TCP_SYNCNT;
- static int ip_ping_group_range_min[] = { 0, 0 };
- static int ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX };
 +static int tcp_syn_linear_timeouts_max = MAX_TCP_SYNCNT;
+ static unsigned long ip_ping_group_range_min[] = { 0, 0 };
+ static unsigned long ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX };
  static u32 u32_max_div_HZ = UINT_MAX / HZ;
  static int one_day_secs = 24 * 3600;
  static u32 fib_multipath_hash_fields_all_mask __maybe_unused =

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

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

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

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

diff --cc net/sched/sch_taprio.c
index 3c4c2c3,dd7dea2..5076da1
--- 1/net/sched/sch_taprio.c
--- 2/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@@ -2456,19 -2388,12 +2456,20 @@@ static int taprio_dump_class_stats(stru
        __acquires(d->lock)
  {
        struct netdev_queue *dev_queue = taprio_queue_get(sch, cl);
-       struct Qdisc *child = dev_queue->qdisc_sleeping;
 +      struct tc_taprio_qopt_offload offload = {
 +              .cmd = TAPRIO_CMD_TC_STATS,
 +              .tc_stats = {
 +                      .tc = cl - 1,
 +              },
 +      };
++      struct Qdisc *child;
  
 -      sch = rtnl_dereference(dev_queue->qdisc_sleeping);
 -      if (gnet_stats_copy_basic(d, NULL, &sch->bstats, true) < 0 ||
 -          qdisc_qstats_copy(d, sch) < 0)
++      child = rtnl_dereference(dev_queue->qdisc_sleeping);
 +      if (gnet_stats_copy_basic(d, NULL, &child->bstats, true) < 0 ||
 +          qdisc_qstats_copy(d, child) < 0)
                return -1;
 -      return 0;
 +
 +      return taprio_dump_xstats(sch, d, &offload, &offload.tc_stats.stats);
  }
  
  static void taprio_walk(struct Qdisc *sch, struct qdisc_walker *arg)

diff --cc tools/include/uapi/linux/bpf.h
Simple merge

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

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

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