Skip to content
Commit 449f6bc1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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
  d636fc5d ("net: sched: add rcu annotations around qdisc->qdisc_sleeping")
  dced11ef ("net/sched: taprio: don't overwrite "sch" variable in taprio_dump_class_stats()")

net/ipv4/sysctl_net_ipv4.c
  e209fee4 ("net/ipv4: ping_group_range: allow GID from 2147483648 to 4294967294")
  ccce324d

 ("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: default avatarJakub Kicinski <kuba@kernel.org>
parents bfd019d1 25041a4c
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment