mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
449f6bc17a
Cross-merge networking fixes after downstream PR. Conflicts: net/sched/sch_taprio.cd636fc5dd6("net: sched: add rcu annotations around qdisc->qdisc_sleeping")dced11ef84("net/sched: taprio: don't overwrite "sch" variable in taprio_dump_class_stats()") net/ipv4/sysctl_net_ipv4.ce209fee411("net/ipv4: ping_group_range: allow GID from 2147483648 to 4294967294")ccce324dab("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>