mirror of
https://github.com/torvalds/linux.git
synced 2026-09-25 21:21:09 -04:00
Merge in the left-over fixes before the net-next pull-request. Conflicts: drivers/net/ethernet/mediatek/mtk_ppe.cae3ed15da5("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear")9d8cb4c096("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc") https://lore.kernel.org/all/[email protected]/ kernel/bpf/helpers.c8addbfc7b3("bpf: Gate dynptr API behind CAP_BPF")5679ff2f13("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF")8a67f2de9b("bpf: expose bpf_strtol and bpf_strtoul to all program types") https://lore.kernel.org/all/[email protected]/ Signed-off-by: Jakub Kicinski <[email protected]>