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.
Showing the changes to tools/include/uapi/linux (1 of 319 files). Show all
Unified · Split
| @@ -1035,6 +1035,7 @@ enum bpf_attach_type { · 1034 unmodified lines | |||
| 1035 | BPF_TRACE_KPROBE_MULTI, | 1035 | BPF_TRACE_KPROBE_MULTI, |
| 1036 | BPF_LSM_CGROUP, | 1036 | BPF_LSM_CGROUP, |
| 1037 | BPF_STRUCT_OPS, | 1037 | BPF_STRUCT_OPS, |
| 1038 | BPF_NETFILTER, | ||
| 1038 | __MAX_BPF_ATTACH_TYPE | 1039 | __MAX_BPF_ATTACH_TYPE |
| 1039 | }; | 1040 | }; |
| 1040 | 1041 | ||