Jakub Kicinski e52f7c1ddf Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Merge in the left-over fixes before the net-next pull-request. Conflicts: drivers/net/ethernet/mediatek/mtk_ppe.c ae3ed15da5 ("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/6cb6893b-4921-a068-4c30-1109795110bb@tessares.net/ kernel/bpf/helpers.c 8addbfc7b3 ("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/20221003201957.13149-1-daniel@iogearbox.net/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2022-10-03 17:44:18 -07:00
..
asm	nds32: Remove the architecture	2022-03-07 13:54:59 +01:00
asm-generic	bitops: wrap non-atomic bitops with a transparent macro	2022-06-30 19:52:41 -07:00
linux	tools: fix compilation after gfp_types.h split	2022-09-11 16:22:31 -07:00
nolibc	tools/nolibc: add a help target to list supported targets	2022-06-20 09:43:19 -07:00
tools	tools include: add dis-asm-compat.h to handle version differences	2022-08-01 15:29:49 -03:00
trace/events
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-10-03 17:44:18 -07:00
vdso	tools headers: Synchronize linux/bits.h with the kernel sources	2020-04-14 11:40:05 -03:00