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
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2022-10-03 17:44:18 -07:00
diag.c	af_unix: Remove unix_table_locks.	2022-06-22 12:59:43 +01:00
garbage.c	af_unix: annote lockless accesses to unix_tot_inflight & gc_in_progress	2022-01-14 18:31:37 -08:00
Kconfig	af_unix: Add OOB support	2021-08-04 09:55:52 +01:00
Makefile	af_unix: Implement ->psock_update_sk_prot()	2021-07-15 18:17:50 -07:00
scm.c	af_unix: annote lockless accesses to unix_tot_inflight & gc_in_progress	2022-01-14 18:31:37 -08:00
scm.h	net: split out functions related to registering inflight socket files	2019-02-28 08:24:23 -07:00
sysctl_net_unix.c	af_unix: fix unix_sysctl_register() error path	2022-07-09 12:27:33 +01:00
unix_bpf.c	net: remove noblock parameter from recvmsg() entities	2022-04-12 15:00:25 +02:00