tree ed59929e7d1fa057ac6998075986a4cdfb85eb5a
parent bfd019d10fdabf70f9b01264aea6d6c7595f9226
parent 25041a4c02c7cf774d8b6ed60586fd64f1cdaa81
author Jakub Kicinski <kuba@kernel.org> 1686249268 -0700
committer Jakub Kicinski <kuba@kernel.org> 1686249314 -0700

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>