Merge in the left-over fixes before the net-next pull-request. Conflicts: drivers/net/ethernet/mediatek/mtk_ppe.c ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear") 9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc") https://lore.kernel.org/all/6cb6893b-4921-a068-4c30-1109795110bb@tessares.net/ kernel/bpf/helpers.c 8addbfc7b308 ("bpf: Gate dynptr API behind CAP_BPF") 5679ff2f138f ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF") 8a67f2de9b1d ("bpf: expose bpf_strtol and bpf_strtoul to all program types") https://lore.kernel.org/all/20221003201957.13149-1-daniel@iogearbox.net/
Showing the changes to include/uapi/linux (1 of 45 files). Show all
Unified · Split
| @@ -1259,7 +1259,7 @@ enum { · 1258 unmodified lines | |||
| 1259 | 1259 | ||
| 1260 | /* Query effective (directly attached + inherited from ancestor cgroups) | 1260 | /* Query effective (directly attached + inherited from ancestor cgroups) |
| 1261 | * programs that will be executed for events within a cgroup. | 1261 | * programs that will be executed for events within a cgroup. |
| 1262 | * attach_flags with this flag are returned only for directly attached programs. | 1262 | * attach_flags with this flag are always returned 0. |
| 1263 | */ | 1263 | */ |
| 1264 | #define BPF_F_QUERY_EFFECTIVE (1U << 0) | 1264 | #define BPF_F_QUERY_EFFECTIVE (1U << 0) |
| 1265 | 1265 | ||
| @@ -1458,7 +1458,10 @@ union bpf_attr { · 192 unmodified lines | |||
| 1458 | __u32 attach_flags; | 1458 | __u32 attach_flags; |
| 1459 | __aligned_u64 prog_ids; | 1459 | __aligned_u64 prog_ids; |
| 1460 | __u32 prog_cnt; | 1460 | __u32 prog_cnt; |
| 1461 | __aligned_u64 prog_attach_flags; /* output: per-program attach_flags */ | 1461 | /* output: per-program attach_flags. |
| 1462 | * not allowed to be set during effective query. | ||
| 1463 | */ | ||
| 1464 | __aligned_u64 prog_attach_flags; | ||
| 1462 | } query; | 1465 | } query; |
| 1463 | 1466 | ||
| 1464 | struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */ | 1467 | struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */ |